naruse	2011-06-13 17:03:22 +0900 (Mon, 13 Jun 2011)

  New Revision: 32049

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

  Log:
    * lib/net/http.rb (Net::HTTP#use_ssl?): require 'openssl' only when
      https is needed. fixes r31933.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32048)
+++ ChangeLog	(revision 32049)
@@ -1,3 +1,8 @@
+Mon Jun 13 17:02:34 2011  NARUSE, Yui  <naruse@r...>
+
+	* lib/net/http.rb (Net::HTTP#use_ssl?): require 'openssl' only when
+	  https is needed. fixes r31933.
+
 Mon Jun 13 14:35:00 2011  Kenta Murata  <mrkn@m...>
 
 	* lib/cmath.rb (CMath.cbrt): returns the principal value of the cube
Index: lib/net/http.rb
===================================================================
--- lib/net/http.rb	(revision 32048)
+++ lib/net/http.rb	(revision 32049)
@@ -657,8 +657,10 @@
 
     # Returns true if SSL/TLS is being used with HTTP.
     def use_ssl?
-      require 'openssl' unless defined?(OpenSSL)
-      @use_ssl
+      if @use_ssl
+        require 'openssl' unless defined?(OpenSSL)
+        true
+      end
     end
 
     # Turn on/off SSL.

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