naruse	2011-06-06 10:53:41 +0900 (Mon, 06 Jun 2011)

  New Revision: 31933

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

  Log:
    * lib/net/http.rb: don't use autoload.

  Modified files:
    trunk/ChangeLog
    trunk/lib/net/http.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31932)
+++ ChangeLog	(revision 31933)
@@ -1,3 +1,7 @@
+Mon Jun  6 10:52:13 2011  NARUSE, Yui  <naruse@r...>
+
+	* lib/net/http.rb: don't use autoload.
+
 Mon Jun  6 09:39:43 2011  Aaron Patterson <aaron@t...>
 
 	* ext/psych/parser.c (parse): release event objects to plug memory
Index: lib/net/http.rb
===================================================================
--- lib/net/http.rb	(revision 31932)
+++ lib/net/http.rb	(revision 31933)
@@ -20,9 +20,7 @@
 #
 
 require 'net/protocol'
-autoload :OpenSSL, 'openssl'
 require 'uri'
-autoload :SecureRandom, 'securerandom'
 
 module Net   #:nodoc:
 
@@ -545,7 +543,10 @@
       http = new(address, port, p_addr, p_port, p_user, p_pass)
 
       if opt
-        opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt) if opt[:use_ssl]
+        if opt[:use_ssl]
+          require 'openssl' unless defined?(OpenSSL)
+          opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt)
+        end
         http.methods.grep(/\A(\w+)=\z/) do |meth|
           key = $1.to_sym
           opt.key?(key) or next
@@ -656,6 +657,7 @@
 
     # Returns true if SSL/TLS is being used with HTTP.
     def use_ssl?
+      require 'openssl' unless defined?(OpenSSL)
       @use_ssl
     end
 
@@ -1961,6 +1963,7 @@
       end
 
       opt = @form_option.dup
+      require 'securerandom' unless defined?(SecureRandom)
       opt[:boundary] ||= SecureRandom.urlsafe_base64(40)
       self.set_content_type(self.content_type, boundary: opt[:boundary])
       if chunked?
@@ -1981,6 +1984,7 @@
     def encode_multipart_form_data(out, params, opt)
       charset = opt[:charset]
       boundary = opt[:boundary]
+      require 'securerandom' unless defined?(SecureRandom)
       boundary ||= SecureRandom.urlsafe_base64(40)
       chunked_p = chunked?
 

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