merges r27690 and r27903 from trunk into ruby_1_9_2.

--
* lib/net/imap.rb (disconnect): terminates @receiver_thread even if
  @sock.shutdown raises an exception.  [ruby-dev:34881]
--
* lib/net/imap.rb (disconnect): closes the socket of a Net::IMAP
  object only when it is not closed.  [ruby-dev:41350]

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

3 files changed, 59 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 004f9f010a..2c38a047a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed May 19 23:19:30 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (disconnect): closes the socket of a Net::IMAP
+	  object only when it is not closed.  [ruby-dev:41350]
+
+Sun May  9 08:24:24 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (disconnect): terminates @receiver_thread even if
+	  @sock.shutdown raises an exception.  [ruby-dev:34881]
+
 Sun May 16 22:17:35 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* eval.c (setup_exception): let SystemStackError#backtrace return an
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 46e8f201a1..3404700297 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -307,9 +307,16 @@ module Net
         end
       rescue Errno::ENOTCONN
         # ignore `Errno::ENOTCONN: Socket is not connected' on some platforms.
+      rescue Exception => e
+        @receiver_thread.raise(e)
       end
       @receiver_thread.join
-      @sock.close
+      synchronize do
+        unless @sock.closed?
+          @sock.close 
+        end
+      end
+      raise e if e
     end
 
     # Returns true if disconnected from the server.
@@ -1012,7 +1019,10 @@ module Net
 
       @client_thread = Thread.current
       @receiver_thread = Thread.start {
-        receive_responses
+        begin
+          receive_responses
+        rescue Exception
+        end
       }
     end
 
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index 766131428c..15528b2962 100644
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -315,6 +315,43 @@ class IMAPTest < Test::Unit::TestCase
     end
   end
 
+  def test_exception_during_shutdown
+    server = TCPServer.new(0)
+    port = server.addr[1]
+    Thread.start do
+      begin
+        sock = server.accept
+        begin
+          sock.print("* OK test server\r\n")
+          sock.gets
+          sock.print("* BYE terminating connection\r\n")
+          sock.print("RUBY0001 OK LOGOUT completed\r\n")
+        ensure
+          sock.close
+        end
+      rescue
+      end
+    end
+    begin
+      begin
+        imap = Net::IMAP.new("localhost", :port => port)
+        imap.instance_eval do
+          def @sock.shutdown(*args)
+            super
+            raise "error"
+          end
+        end
+        imap.logout
+      ensure
+        assert_raise(RuntimeError) do
+          imap.disconnect
+        end
+      end
+    ensure
+      server.close
+    end
+  end
+
   private
 
   def imaps_test