* lib/net/http.rb (Net::HTTP::SSL_ATTRIBUTES): refix 33701.

store instance variable symbol names.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-11-26 11:06:53 +00:00
parent 5fa9e5c366
commit 9d4db2d4d9
2 changed files with 18 additions and 14 deletions

View File

@ -1,3 +1,8 @@
Sat Nov 26 20:01:18 2011 NARUSE, Yui <naruse@ruby-lang.org>
* lib/net/http.rb (Net::HTTP::SSL_ATTRIBUTES): refix 33701.
store instance variable symbol names.
Sat Nov 26 15:40:25 2011 URABE Shyouhei <shyouhei@ruby-lang.org> Sat Nov 26 15:40:25 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
* .travis.yml (script): should be ./configure * .travis.yml (script): should be ./configure

View File

@ -591,7 +591,7 @@ module Net #:nodoc:
@sspi_enabled = false @sspi_enabled = false
if defined?(SSL_ATTRIBUTES) if defined?(SSL_ATTRIBUTES)
SSL_ATTRIBUTES.each do |name| SSL_ATTRIBUTES.each do |name|
instance_variable_set "@#{name}", nil instance_variable_set name, nil
end end
end end
end end
@ -675,17 +675,17 @@ module Net #:nodoc:
end end
SSL_ATTRIBUTES = [ SSL_ATTRIBUTES = [
:ca_file, :@ca_file,
:ca_path, :@ca_path,
:cert, :@cert,
:cert_store, :@cert_store,
:ciphers, :@ciphers,
:key, :@key,
:ssl_timeout, :@ssl_timeout,
:ssl_version, :@ssl_version,
:verify_callback, :@verify_callback,
:verify_depth, :@verify_depth,
:verify_mode, :@verify_mode,
] ]
# Sets path of a CA certification file in PEM format. # Sets path of a CA certification file in PEM format.
@ -773,8 +773,7 @@ module Net #:nodoc:
if use_ssl? if use_ssl?
ssl_parameters = Hash.new ssl_parameters = Hash.new
iv_list = instance_variables iv_list = instance_variables
SSL_ATTRIBUTES.each do |name| SSL_ATTRIBUTES.each do |ivname|
ivname = "@#{name}".intern
if iv_list.include?(ivname) and if iv_list.include?(ivname) and
value = instance_variable_get(ivname) value = instance_variable_get(ivname)
ssl_parameters[name] = value ssl_parameters[name] = value