merge -c 12158

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d2ecb547e0..7e823e2370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 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
diff --git a/version.h b/version.h
index b512244e35..bc0e2dfa96 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-05-23"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070523
-#define RUBY_PATCHLEVEL 10
+#define RUBY_PATCHLEVEL 11
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8