* lib/net/https.rb: backported from trunk, rev 1.3. [ruby-dev:25673] …

…(again), [ruby-dev:26617] (again), [ruby-dev:27062]

* ext/openssl/lib/net/https.rb: removed.
* ext/openssl/lib/net/protocols.rb: removed.
* lib/net/http.rb: #use_ssl?, #use_ssl are moved from net/https.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,15 @@
+Wed Sep 14 01:26:03 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/https.rb: backported from trunk, rev 1.3.
+	  [ruby-dev:25673] (again), [ruby-dev:26617] (again),
+	  [ruby-dev:27062]
+
+	* ext/openssl/lib/net/https.rb: removed.
+
+	* ext/openssl/lib/net/protocols.rb: removed.
+
+	* lib/net/http.rb: #use_ssl?, #use_ssl are moved from net/https.
+
 Tue Sep 13 22:09:40 2005  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/logger.rb (Logger): added formatter accessor to logger for

lib/net/http.rb

@@ -523,9 +523,11 @@ def started?
 
     # returns true if use SSL/TLS with HTTP.
     def use_ssl?
-      false   # redefined in net/https
+      @use_ssl
     end
 
+    alias use_ssl use_ssl?   #:nodoc: obsolete
+
     # Opens TCP connection and HTTP session.
     # 
     # When this method is called with block, gives a HTTP object

lib/net/https.rb

@@ -104,13 +104,6 @@
 module Net
 
   class HTTP
-    remove_method :use_ssl?
-    def use_ssl?
-      @use_ssl
-    end
-
-    alias use_ssl use_ssl?   # for backward compatibility
-
     # Turn on/off SSL.
     # This flag must be set before starting session.
     # If you change use_ssl value after session started,
@@ -160,7 +153,8 @@ def ssl_timeout=(sec)
       @ssl_context.timeout = sec
     end
 
-    alias timeout= ssl_timeout=   # for backward compatibility
+    # For backward compatibility
+    alias timeout= ssl_timeout=
 
     def peer_cert
       return nil if not use_ssl? or not @socket