naruse	2012-05-21 11:27:07 +0900 (Mon, 21 May 2012)

  New Revision: 35733

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

  Log:
    * lib/net/ftp.rb (Net::FTP#transfercmd): rescue shutdown.

  Modified files:
    trunk/ChangeLog
    trunk/lib/net/ftp.rb
    trunk/test/net/ftp/test_ftp.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35732)
+++ ChangeLog	(revision 35733)
@@ -1,3 +1,7 @@
+Mon May 21 11:26:17 2012  NARUSE, Yui  <naruse@r...>
+
+	* lib/net/ftp.rb (Net::FTP#transfercmd): rescue shutdown.
+
 Sun May 20 23:00:11 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/extmk.rb (extmake): reopen $stdout to NULL, since setting
Index: lib/net/ftp.rb
===================================================================
--- lib/net/ftp.rb	(revision 35732)
+++ lib/net/ftp.rb	(revision 35733)
@@ -433,7 +433,7 @@
         end
         conn = BufferedSocket.new(sock.accept)
         conn.read_timeout = @read_timeout
-        sock.shutdown(Socket::SHUT_WR)
+        sock.shutdown(Socket::SHUT_WR) rescue nil
         sock.read rescue nil
         sock.close
       end
@@ -483,16 +483,19 @@
     def retrbinary(cmd, blocksize, rest_offset = nil) # :yield: data
       synchronize do
         with_binary(true) do
-          conn = transfercmd(cmd, rest_offset)
-          loop do
-            data = conn.read(blocksize)
-            break if data == nil
-            yield(data)
+          begin
+            conn = transfercmd(cmd, rest_offset)
+            loop do
+              data = conn.read(blocksize)
+              break if data == nil
+              yield(data)
+            end
+            conn.shutdown(Socket::SHUT_WR)
+            conn.read_timeout = 1
+            conn.read
+          ensure
+            conn.close
           end
-          conn.shutdown(Socket::SHUT_WR)
-          conn.read_timeout = 1
-          conn.read
-          conn.close
           voidresp
         end
       end
Index: test/net/ftp/test_ftp.rb
===================================================================
--- test/net/ftp/test_ftp.rb	(revision 35732)
+++ test/net/ftp/test_ftp.rb	(revision 35733)
@@ -6,6 +6,16 @@
 class FTPTest < Test::Unit::TestCase
   SERVER_ADDR = "127.0.0.1"
 
+  def setup
+    @thread = nil
+  end
+
+  def teardown
+    if @thread
+      @thread.join
+    end
+  end
+
   def test_not_connected
     ftp = Net::FTP.new
     assert_raise(Net::FTPConnectionError) do
@@ -272,7 +282,8 @@
         conn.print(l, "\r\n")
       end
       conn.shutdown(Socket::SHUT_WR)
-      conn.read
+      conn.read_timeout = 1
+      conn.read unless conn.eof?
       conn.close
       sock.print("226 Directory send OK.\r\n")
     }
@@ -586,7 +597,7 @@
 
   def create_ftp_server(sleep_time = nil)
     server = TCPServer.new(SERVER_ADDR, 0)
-    Thread.start do
+    @thread = Thread.start do
       begin
         if sleep_time
           sleep(sleep_time)

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