naruse	2011-06-13 19:21:07 +0900 (Mon, 13 Jun 2011)

  New Revision: 32054

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

  Log:
    Additional fix for r31933.

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

Index: lib/net/http.rb
===================================================================
--- lib/net/http.rb	(revision 32053)
+++ lib/net/http.rb	(revision 32054)
@@ -544,7 +544,6 @@
 
       if opt
         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|
@@ -657,10 +656,7 @@
 
     # Returns true if SSL/TLS is being used with HTTP.
     def use_ssl?
-      if @use_ssl
-        require 'openssl' unless defined?(OpenSSL)
-        true
-      end
+      @use_ssl
     end
 
     # Turn on/off SSL.
@@ -668,7 +664,12 @@
     # If you change use_ssl value after session started,
     # a Net::HTTP object raises IOError.
     def use_ssl=(flag)
-      flag = (flag ? true : false)
+      flag = if flag
+        require 'openssl' unless defined?(OpenSSL)
+        true
+      else
+        false
+      end
       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/