diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/net/http.rb | 27 |
2 files changed, 25 insertions, 8 deletions
@@ -1,3 +1,9 @@ +Sun Nov 27 04:55:45 2011 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/net/http.rb (Net::HTTP::SSL_IVNAMES): rerefix 33701. + SSL_ATTRIBUTES stores names for set_params, they are symbol. + SSL_IVNAMES stores instance variable names. + Sun Nov 27 00:16:07 2011 Tanaka Akira <akr@fsij.org> * io.c (copy_stream_body): use 0666 for permission argument for open. diff --git a/lib/net/http.rb b/lib/net/http.rb index c383f206d3..9867e280e0 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -591,10 +591,8 @@ module Net #:nodoc: @enable_post_connection_check = true @compression = nil @sspi_enabled = false - if defined?(SSL_ATTRIBUTES) - SSL_ATTRIBUTES.each do |name| - instance_variable_set name, nil - end + SSL_IVNAMES.each do |ivname| + instance_variable_set ivname, nil end end @@ -676,7 +674,7 @@ module Net #:nodoc: @use_ssl = flag end - SSL_ATTRIBUTES = [ + SSL_IVNAMES = [ :@ca_file, :@ca_path, :@cert, @@ -689,6 +687,19 @@ module Net #:nodoc: :@verify_depth, :@verify_mode, ] + SSL_ATTRIBUTES = [ + :ca_file, + :ca_path, + :cert, + :cert_store, + :ciphers, + :key, + :ssl_timeout, + :ssl_version, + :verify_callback, + :verify_depth, + :verify_mode, + ] # Sets path of a CA certification file in PEM format. # @@ -775,10 +786,10 @@ module Net #:nodoc: if use_ssl? ssl_parameters = Hash.new iv_list = instance_variables - SSL_ATTRIBUTES.each do |ivname| + SSL_IVNAMES.each_with_index do |ivname, i| if iv_list.include?(ivname) and - value = instance_variable_get(ivname) - ssl_parameters[name] = value + value = instance_variable_get(ivname) + ssl_parameters[SSL_ATTRIBUTES[i]] = value if value end end @ssl_context = OpenSSL::SSL::SSLContext.new |