From 687637e280158f773d87e14896566f532338d293 Mon Sep 17 00:00:00 2001 From: shugo Date: Mon, 9 Apr 2007 00:29:48 +0000 Subject: [PATCH] * lib/net/imap.rb (disconnect): call shutdown for SSLSocket. Thanks, Technorama Ltd. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/net/imap.rb | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f553958e9d..d90fdc7e70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 9 09:30:44 2007 Shugo Maeda + + * lib/net/imap.rb (disconnect): call shutdown for + SSLSocket. Thanks, Technorama Ltd. + Thu Apr 5 00:42:48 2007 Nobuyoshi Nakada * error.c (rb_notimplement), io.c (pipe_open): removed definite diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 547e23e618..59df778695 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