summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-17 16:09:44 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-17 16:09:44 +0000
commite14c9923b47f3075ca9040620f12c8e258b3435a (patch)
tree979c0e9b1905ee6aa6cd5cc81622fa9370e2454a /lib
parent47d55a02a332633a75847d819cab3241f7060289 (diff)
* ext/openssl: avoid cyclic require.
* ext/openssl/lib/openssl/ssl-internal.rb: renamed from ssl.rb * ext/openssl/lib/openssl/x509-internal.rb: renamed from x509.rb. * lib/net/imap.rb: require openssl, instead of openssl/ssl. * lib/net/pop.rb: require openssl, instead of openssl/ssl. [ruby-dev:38018] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/net/imap.rb2
-rw-r--r--lib/net/pop.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index ea2b598606..3364561508 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -18,7 +18,7 @@ require "monitor"
require "digest/md5"
require "strscan"
begin
- require "openssl/ssl"
+ require "openssl"
rescue LoadError
end
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index 7d234c191c..accac72905 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -25,7 +25,7 @@ require 'digest/md5'
require 'timeout'
begin
- require "openssl/ssl"
+ require "openssl"
rescue LoadError
end