summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-22 16:45:03 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-22 16:45:03 +0000
commita8726c04b1d6870a2a584acf7299b5d64e62a185 (patch)
tree56b5d38359026867453e8a7f95331976db2f93d4 /lib
parent0480478e13661246885ffa83375dc623397d27b4 (diff)
merge -c 12158
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12316 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 29b6359e0e..4cd1d6780f 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