diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-17 16:09:44 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-17 16:09:44 +0000 |
| commit | 265b2e9081be729fe318fa2e9c7ef2397144448a (patch) | |
| tree | 979c0e9b1905ee6aa6cd5cc81622fa9370e2454a /lib | |
| parent | f77320bb4fad3d1bc89003cf4c373f866c484348 (diff) | |
| download | ruby-265b2e9081be729fe318fa2e9c7ef2397144448a.tar.gz ruby-265b2e9081be729fe318fa2e9c7ef2397144448a.tar.xz ruby-265b2e9081be729fe318fa2e9c7ef2397144448a.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@22378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/imap.rb | 2 | ||||
| -rw-r--r-- | lib/net/pop.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/net/imap.rb b/lib/net/imap.rb index ea2b59860..336456150 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 7d234c191..accac7290 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 |