From a1455c75e93c536e0e8e4076fe2fa091ecb1d4ab Mon Sep 17 00:00:00 2001
From: gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 7 Oct 2007 08:53:06 +0000
Subject: * lib/net/http.rb: remove enable_post_connection_check flag.

* lib/open-uri.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       |  6 ++++++
 lib/net/http.rb | 10 +---------
 lib/open-uri.rb |  5 -----
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6537d8a83a..ac1194055b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Oct  7 17:50:14 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* 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@atdot.net>
 
 	* insns.def (opt_eq): fix to use rb_str_equal().
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 287881c9c2..29377fc473 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -533,9 +533,6 @@ module Net   #:nodoc:
       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 @@ module Net   #:nodoc:
         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
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index dd0e0b5912..5e8accd8f2 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -98,7 +98,6 @@ module OpenURI
     :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 @@ module OpenURI
     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]
-- 
cgit v1.2.3