shyouhei	2009-01-09 19:24:32 +0900 (Fri, 09 Jan 2009)

  New Revision: 21409

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21409

  Log:
    merge revision(s) 18368:
    * lib/net/imap.rb (disconnect): do not refer SSL::SSLSocket for
      environments without OpenSSL.  backported from trunk.
      fixed [ruby-dev:35755].

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/lib/net/imap.rb
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 21408)
+++ ruby_1_8_6/ChangeLog	(revision 21409)
@@ -1,3 +1,9 @@
+Fri Jan  9 19:22:24 2009  Shugo Maeda  <shugo@r...>
+
+	* lib/net/imap.rb (disconnect): do not refer SSL::SSLSocket for
+	  environments without OpenSSL.  backported from trunk.
+	  fixed [ruby-dev:35755].
+
 Thu Jan  8 13:20:15 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (deferred_nodes, compstmt, arg, fixup_nodes, range_op): fix
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21408)
+++ ruby_1_8_6/version.h	(revision 21409)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-01-08"
+#define RUBY_RELEASE_DATE "2009-01-09"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090108
-#define RUBY_PATCHLEVEL 293
+#define RUBY_RELEASE_CODE 20090109
+#define RUBY_PATCHLEVEL 294
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 9
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_6/lib/net/imap.rb
===================================================================
--- ruby_1_8_6/lib/net/imap.rb	(revision 21408)
+++ ruby_1_8_6/lib/net/imap.rb	(revision 21409)
@@ -284,9 +284,11 @@
 
     # Disconnects from the server.
     def disconnect
-      if SSL::SSLSocket === @sock
+      begin
+        # try to call SSL::SSLSocket#io.
         @sock.io.shutdown
-      else
+      rescue NoMethodError
+        # @sock is not an SSL::SSLSocket.
         @sock.shutdown
       end
       @receiver_thread.join

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/