diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-09 17:57:17 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-09 17:57:17 +0000 |
commit | b2cc46df61f799e01a4dff7be3945a1726fafb39 (patch) | |
tree | fccc74b5fc6660b396e899f240fa463cb41a2be3 | |
parent | eef1a7c6c1dc84037f157d5972e78ab72ba015d9 (diff) | |
download | ruby-b2cc46df61f799e01a4dff7be3945a1726fafb39.tar.gz |
merge revision(s) 32899:
* lib/net/http.rb: come back autoload. OpenSSL constant is used
some places, so it leads mistakes like HTTP.start.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/net/http.rb | 8 |
2 files changed, 7 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Wed Aug 10 02:57:01 2011 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/net/http.rb: come back autoload. OpenSSL constant is used + some places, so it leads mistakes like HTTP.start. + Tue Aug 9 22:57:45 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> * ext/date/date_parse.c (date_zone_to_diff): add RB_GC_GUARD. diff --git a/lib/net/http.rb b/lib/net/http.rb index 7c9032aaa6..7b9ec4f568 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -21,6 +21,7 @@ require 'net/protocol' require 'uri' +autoload :OpenSSL, 'openssl' module Net #:nodoc: @@ -666,12 +667,7 @@ module Net #:nodoc: # If you change use_ssl value after session started, # a Net::HTTP object raises IOError. def use_ssl=(flag) - flag = if flag - require 'openssl' unless defined?(OpenSSL) - true - else - false - end + flag = flag ? true : false if started? and @use_ssl != flag raise IOError, "use_ssl value changed, but session already started" end |