naruse	2011-08-10 02:57:17 +0900 (Wed, 10 Aug 2011)

  New Revision: 32901

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32901

  Log:
    merge revision(s) 32899:
    
    * lib/net/http.rb: come back autoload. OpenSSL constant is used
      some places, so it leads mistakes like HTTP.start.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/net/http.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32900)
+++ ruby_1_9_3/ChangeLog	(revision 32901)
@@ -1,3 +1,8 @@
+Wed Aug 10 02:57:01 2011  NARUSE, Yui  <naruse@r...>
+
+	* 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@g...>
 
 	* ext/date/date_parse.c (date_zone_to_diff): add RB_GC_GUARD.
Index: ruby_1_9_3/lib/net/http.rb
===================================================================
--- ruby_1_9_3/lib/net/http.rb	(revision 32900)
+++ ruby_1_9_3/lib/net/http.rb	(revision 32901)
@@ -21,6 +21,7 @@
 
 require 'net/protocol'
 require 'uri'
+autoload :OpenSSL, 'openssl'
 
 module Net   #:nodoc:
 
@@ -666,12 +667,7 @@
     # 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/