From b2cc46df61f799e01a4dff7be3945a1726fafb39 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 9 Aug 2011 17:57:17 +0000 Subject: 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 --- lib/net/http.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'lib') 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 -- cgit v1.2.3