0ce3eec
diff -ruN ruby-1.8.6-p110.orig/ext/openssl/lib/openssl/ssl.rb ruby-1.8.6-p110/ext/openssl/lib/openssl/ssl.rb
0ce3eec
--- ruby-1.8.6-p110.orig/ext/openssl/lib/openssl/ssl.rb	2007-02-13 08:01:19.000000000 +0900
0ce3eec
+++ ruby-1.8.6-p110/ext/openssl/lib/openssl/ssl.rb	2007-10-04 22:38:48.000000000 +0900
0ce3eec
@@ -88,7 +88,7 @@
0ce3eec
             end
0ce3eec
           }
0ce3eec
         end
0ce3eec
-        raise SSLError, "hostname not match"
0ce3eec
+        raise SSLError, "hostname not match with the server certificate"
0ce3eec
       end
0ce3eec
     end
0ce3eec
 
0ce3eec
diff -ruN ruby-1.8.6-p110.orig/lib/net/http.rb ruby-1.8.6-p110/lib/net/http.rb
0ce3eec
--- ruby-1.8.6-p110.orig/lib/net/http.rb	2007-02-13 08:01:19.000000000 +0900
0ce3eec
+++ ruby-1.8.6-p110/lib/net/http.rb	2007-10-04 22:41:34.000000000 +0900
0ce3eec
@@ -470,6 +470,7 @@
0ce3eec
       @debug_output = nil
0ce3eec
       @use_ssl = false
0ce3eec
       @ssl_context = nil
0ce3eec
+      @enable_post_connection_check = true
0ce3eec
     end
0ce3eec
 
0ce3eec
     def inspect
0ce3eec
@@ -526,6 +527,9 @@
0ce3eec
       false   # redefined in net/https
0ce3eec
     end
0ce3eec
 
0ce3eec
+    # specify enabling SSL server certificate and hostname checking.
0ce3eec
+    attr_accessor :enable_post_connection_check
0ce3eec
+
0ce3eec
     # Opens TCP connection and HTTP session.
0ce3eec
     # 
0ce3eec
     # When this method is called with block, gives a HTTP object
0ce3eec
@@ -584,6 +588,14 @@
0ce3eec
           HTTPResponse.read_new(@socket).value
0ce3eec
         end
0ce3eec
         s.connect
0ce3eec
+        if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
0ce3eec
+          begin
0ce3eec
+           s.post_connection_check(@address)
0ce3eec
+          rescue OpenSSL::SSL::SSLError => ex
0ce3eec
+           raise ex if @enable_post_connection_check
0ce3eec
+           warn ex.message
0ce3eec
+          end
0ce3eec
+        end
0ce3eec
       end
0ce3eec
       on_connect
0ce3eec
     end
0ce3eec
diff -ruN ruby-1.8.6-p110.orig/lib/open-uri.rb ruby-1.8.6-p110/lib/open-uri.rb
0ce3eec
--- ruby-1.8.6-p110.orig/lib/open-uri.rb	2007-02-13 08:01:19.000000000 +0900
0ce3eec
+++ ruby-1.8.6-p110/lib/open-uri.rb	2007-10-04 22:42:18.000000000 +0900
0ce3eec
@@ -229,6 +229,7 @@
0ce3eec
     if target.class == URI::HTTPS
0ce3eec
       require 'net/https'
0ce3eec
       http.use_ssl = true
0ce3eec
+      http.enable_post_connection_check = true
0ce3eec
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
0ce3eec
       store = OpenSSL::X509::Store.new
0ce3eec
       store.set_default_paths
0ce3eec
@@ -240,16 +241,6 @@
0ce3eec
 
0ce3eec
     resp = nil
0ce3eec
     http.start {
0ce3eec
-      if target.class == URI::HTTPS
0ce3eec
-        # xxx: information hiding violation
0ce3eec
-        sock = http.instance_variable_get(:@socket)
0ce3eec
-        if sock.respond_to?(:io)
0ce3eec
-          sock = sock.io # 1.9
0ce3eec
-        else
0ce3eec
-          sock = sock.instance_variable_get(:@socket) # 1.8
0ce3eec
-        end
0ce3eec
-        sock.post_connection_check(target_host)
0ce3eec
-      end
0ce3eec
       req = Net::HTTP::Get.new(request_uri, header)
0ce3eec
       if options.include? :http_basic_authentication
0ce3eec
         user, pass = options[:http_basic_authentication]
0ce3eec
diff -ruN ruby-1.8.6-p110.orig/version.h ruby-1.8.6-p110/version.h
0ce3eec
--- ruby-1.8.6-p110.orig/version.h	2007-09-23 09:01:50.000000000 +0900
0ce3eec
+++ ruby-1.8.6-p110/version.h	2007-10-04 22:42:37.000000000 +0900
0ce3eec
@@ -1,15 +1,15 @@
0ce3eec
 #define RUBY_VERSION "1.8.6"
0ce3eec
-#define RUBY_RELEASE_DATE "2007-09-23"
0ce3eec
+#define RUBY_RELEASE_DATE "2007-09-24"
0ce3eec
 #define RUBY_VERSION_CODE 186
0ce3eec
-#define RUBY_RELEASE_CODE 20070923
0ce3eec
-#define RUBY_PATCHLEVEL 110
0ce3eec
+#define RUBY_RELEASE_CODE 20070924
0ce3eec
+#define RUBY_PATCHLEVEL 111
0ce3eec
 
0ce3eec
 #define RUBY_VERSION_MAJOR 1
0ce3eec
 #define RUBY_VERSION_MINOR 8
0ce3eec
 #define RUBY_VERSION_TEENY 6
0ce3eec
 #define RUBY_RELEASE_YEAR 2007
0ce3eec
 #define RUBY_RELEASE_MONTH 9
0ce3eec
-#define RUBY_RELEASE_DAY 23
0ce3eec
+#define RUBY_RELEASE_DAY 24
0ce3eec
 
0ce3eec
 #ifdef RUBY_EXTERN
0ce3eec
 RUBY_EXTERN const char ruby_version[];