diff options
| author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-13 16:27:01 +0000 |
|---|---|---|
| committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-13 16:27:01 +0000 |
| commit | 6db56d9a50bda495ddac87869cfd7777f69f2e7c (patch) | |
| tree | 60f610769c8c4f353773d5bca389ec484cb78929 /lib/net | |
| parent | 5d0bf5623513d1610b51a479776a21359c82db58 (diff) | |
* 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
Diffstat (limited to 'lib/net')
| -rw-r--r-- | lib/net/http.rb | 4 | ||||
| -rw-r--r-- | lib/net/https.rb | 10 |
2 files changed, 5 insertions, 9 deletions
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 |