From 6db56d9a50bda495ddac87869cfd7777f69f2e7c Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 13 Sep 2005 16:27:01 +0000
Subject: * 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
---
 lib/net/http.rb  |  4 +++-
 lib/net/https.rb | 10 ++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'lib/net')

diff --git a/lib/net/http.rb b/lib/net/http.rb
index 51d2e7c9d3..98e16c9294 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -523,9 +523,11 @@ module Net   #:nodoc:
 
     # 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
diff --git a/lib/net/https.rb b/lib/net/https.rb
index fb329df43d..8268c04885 100644
--- a/lib/net/https.rb
+++ b/lib/net/https.rb
@@ -104,13 +104,6 @@ require 'openssl'
 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 @@ module Net
       @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
-- 
cgit v1.2.3