gotoyuzo	2007-10-07 17:53:06 +0900 (Sun, 07 Oct 2007)

  New Revision: 13648

  Modified files:
    trunk/ChangeLog
    trunk/lib/net/http.rb
    trunk/lib/open-uri.rb

  Log:
    * lib/net/http.rb: remove enable_post_connection_check flag.
    
    * lib/open-uri.rb: ditto.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13648&r2=13647
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/open-uri.rb?r1=13648&r2=13647
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/net/http.rb?r1=13648&r2=13647

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13647)
+++ ChangeLog	(revision 13648)
@@ -1,3 +1,9 @@
+Sun Oct  7 17:50:14 2007  GOTOU Yuuzou  <gotoyuzo@n...>
+
+	* lib/net/http.rb: remove enable_post_connection_check flag.
+
+	* lib/open-uri.rb: ditto.
+
 Sun Oct 07 15:48:40 2007  Koichi Sasada  <ko1@a...>
 
 	* insns.def (opt_eq): fix to use rb_str_equal().
Index: lib/open-uri.rb
===================================================================
--- lib/open-uri.rb	(revision 13647)
+++ lib/open-uri.rb	(revision 13648)
@@ -98,7 +98,6 @@
     :read_timeout => true,
     :ssl_ca_cert => nil,
     :ssl_verify_mode => nil,
-    :ssl_enable_post_connection_check => true,
     :ftp_active_mode => false,
   }
 
@@ -270,10 +269,6 @@
     if target.class == URI::HTTPS
       require 'net/https'
       http.use_ssl = true
-      http.enable_post_connection_check = 
-        options.has_key?(:ssl_enable_post_connection_check) ?
-        options[:ssl_enable_post_connection_check] :
-        Options[:ssl_enable_post_connection_check]
       http.verify_mode = options[:ssl_verify_mode] || OpenSSL::SSL::VERIFY_PEER
       store = OpenSSL::X509::Store.new
       if options[:ssl_ca_cert]
Index: lib/net/http.rb
===================================================================
--- lib/net/http.rb	(revision 13647)
+++ lib/net/http.rb	(revision 13648)
@@ -533,9 +533,6 @@
       false   # redefined in net/https
     end
 
-    # specify enabling SSL server certificate and hostname checking.
-    attr_accessor :enable_post_connection_check
-
     # Opens TCP connection and HTTP session.
     # 
     # When this method is called with block, gives a HTTP object
@@ -595,12 +592,7 @@
         end
         s.connect
         if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-          begin
-            s.post_connection_check(@address)
-          rescue OpenSSL::SSL::SSLError => ex
-            raise ex if @enable_post_connection_check
-            warn ex.message
-          end
+          s.post_connection_check(@address)
         end
       end
       on_connect

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml