summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-28 07:19:55 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-28 07:19:55 +0000
commit47da798d84f2eceea4dcda61c62180505899d9c1 (patch)
tree389fea9635f05327e790623c06d98916d6d5bdc6
parent60ee8da7b8b81bff83806eb4f5677a8c1c1570d7 (diff)
downloadruby-47da798d84f2eceea4dcda61c62180505899d9c1.tar.gz
ruby-47da798d84f2eceea4dcda61c62180505899d9c1.tar.xz
ruby-47da798d84f2eceea4dcda61c62180505899d9c1.zip
* lib/net/http.rb: suppress warnings of non-existing instance variable
access for SSL. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/http.rb5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1074feaf0..5435baac6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 28 16:18:39 2009 Tanaka Akira <akr@fsij.org>
+
+ * lib/net/http.rb: suppress warnings of non-existing instance variable
+ access for SSL.
+
Sat Feb 28 14:50:47 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/lib/socket.rb (BasicSocket#connect_address): returns ::1
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 82e5ee6cc..e3716b1bd 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -582,8 +582,11 @@ module Net #:nodoc:
D "opened"
if use_ssl?
ssl_parameters = Hash.new
+ iv_list = instance_variables
SSL_ATTRIBUTES.each do |name|
- if value = instance_variable_get("@#{name}")
+ ivname = "@#{name}".intern
+ if iv_list.include?(ivname) and
+ value = instance_variable_get(ivname)
ssl_parameters[name] = value
end
end