summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-22 16:44:37 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-22 16:44:37 +0000
commit3d2532f49ad9b446b6ece363c49299bcdece7ed5 (patch)
tree80dc6b5f6046994345d157ff9cb2797c268bb43d /lib
parentf2622fefe29de31778c3c61d0acf17d4c2e7994c (diff)
downloadruby-3d2532f49ad9b446b6ece363c49299bcdece7ed5.tar.gz
ruby-3d2532f49ad9b446b6ece363c49299bcdece7ed5.tar.xz
ruby-3d2532f49ad9b446b6ece363c49299bcdece7ed5.zip
merge -c 12158
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@12315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/net/imap.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 547e23e61..59df77869 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -284,7 +284,11 @@ module Net
# Disconnects from the server.
def disconnect
- @sock.shutdown unless @usessl
+ if SSL::SSLSocket === @sock
+ @sock.io.shutdown
+ else
+ @sock.shutdown
+ end
@receiver_thread.join
@sock.close
end