diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-22 16:45:03 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-22 16:45:03 +0000 |
commit | a8726c04b1d6870a2a584acf7299b5d64e62a185 (patch) | |
tree | 56b5d38359026867453e8a7f95331976db2f93d4 | |
parent | 0480478e13661246885ffa83375dc623397d27b4 (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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/net/imap.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed May 23 01:42:29 2007 Shugo Maeda <shugo@ruby-lang.org> + + * lib/net/imap.rb (disconnect): call shutdown for + SSLSocket. Thanks, Technorama Ltd. + Wed May 23 01:28:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * error.c (rb_notimplement), io.c (pipe_open): removed definite 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 @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-05-23" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20070523 -#define RUBY_PATCHLEVEL 41 +#define RUBY_PATCHLEVEL 42 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |