diff --git a/ChangeLog b/ChangeLog index dc81ff8e6f..de7fcd93c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Nov 26 20:01:18 2011 NARUSE, Yui + + * lib/net/http.rb (Net::HTTP::SSL_ATTRIBUTES): refix 33701. + store instance variable symbol names. + Sat Nov 26 15:40:25 2011 URABE Shyouhei * .travis.yml (script): should be ./configure diff --git a/lib/net/http.rb b/lib/net/http.rb index 1c594e0e4d..2fd81e0d2c 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -591,7 +591,7 @@ module Net #:nodoc: @sspi_enabled = false if defined?(SSL_ATTRIBUTES) SSL_ATTRIBUTES.each do |name| - instance_variable_set "@#{name}", nil + instance_variable_set name, nil end end end @@ -675,17 +675,17 @@ module Net #:nodoc: end SSL_ATTRIBUTES = [ - :ca_file, - :ca_path, - :cert, - :cert_store, - :ciphers, - :key, - :ssl_timeout, - :ssl_version, - :verify_callback, - :verify_depth, - :verify_mode, + :@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. @@ -773,8 +773,7 @@ module Net #:nodoc: if use_ssl? ssl_parameters = Hash.new iv_list = instance_variables - SSL_ATTRIBUTES.each do |name| - ivname = "@#{name}".intern + SSL_ATTRIBUTES.each do |ivname| if iv_list.include?(ivname) and value = instance_variable_get(ivname) ssl_parameters[name] = value