diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 16:15:19 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 16:15:19 +0000 |
| commit | f2af1c58158c45b0f7273158e86b3c749f1138f5 (patch) | |
| tree | 77c434c2d9b46aff6b3b11ac839a18929b7c3020 /lib | |
| parent | ddf5c0d8c706469bc6b1fbfd1aceebab8fca1ad8 (diff) | |
merge revision(s) 13657:
* lib/net/http.rb, lib/open-uri.rb: remove
Net::HTTP#enable_post_connection_check. [ruby-dev:31960]
* lib/net/imap.rb: hostname should be verified against server's
indentity as persented in the server's certificate. [ruby-dev:31960]
* ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/http.rb | 11 | ||||
| -rw-r--r-- | lib/net/imap.rb | 1 | ||||
| -rw-r--r-- | lib/open-uri.rb | 1 |
3 files changed, 2 insertions, 11 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index 54721a49a4..d518f32cbb 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -470,7 +470,6 @@ module Net #:nodoc: @debug_output = nil @use_ssl = false @ssl_context = nil - @enable_post_connection_check = false end def inspect @@ -527,9 +526,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 @@ -589,12 +585,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/net/imap.rb b/lib/net/imap.rb index 586f3fe4c0..57e78ec135 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -900,6 +900,7 @@ module Net end @sock = SSLSocket.new(@sock, context) @sock.connect # start ssl session. + @sock.post_connection_check(@host) if verify else @usessl = false end diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 36a0639a80..0dae95b6e6 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -229,7 +229,6 @@ module OpenURI if target.class == URI::HTTPS require 'net/https' http.use_ssl = true - http.enable_post_connection_check = true http.verify_mode = OpenSSL::SSL::VERIFY_PEER store = OpenSSL::X509::Store.new store.set_default_paths |