summaryrefslogtreecommitdiffstats
path: root/lib/net/https.rb
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-13 16:27:01 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-13 16:27:01 +0000
commit30ffc0da3ceb505ca14b39142e10fd24e37de4e2 (patch)
tree60f610769c8c4f353773d5bca389ec484cb78929 /lib/net/https.rb
parent7dac03ecfaaae71e8e69ad9a6f6831110c1a05a6 (diff)
downloadruby-30ffc0da3ceb505ca14b39142e10fd24e37de4e2.tar.gz
ruby-30ffc0da3ceb505ca14b39142e10fd24e37de4e2.tar.xz
ruby-30ffc0da3ceb505ca14b39142e10fd24e37de4e2.zip
* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net/https.rb')
-rw-r--r--lib/net/https.rb10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/net/https.rb b/lib/net/https.rb
index fb329df43..8268c0488 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