mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
3c78d621e6
commit
a1455c75e9
3 changed files with 7 additions and 14 deletions
|
@ -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().
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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]
|
||||
|
|
Loading…
Reference in a new issue