From d795f2d1a803c03a7180f6f5049d3a9a0e8849f0 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 20 May 2012 21:56:40 +0000
Subject: [PATCH] Shutdown gracefully.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/net/ftp.rb           | 8 ++++++++
 test/net/ftp/test_ftp.rb | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 5be2981dd0..3684d1ebf4 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -433,6 +433,8 @@ module Net
         end
         conn = BufferedSocket.new(sock.accept)
         conn.read_timeout = @read_timeout
+        sock.shutdown(Socket::SHUT_WR)
+        sock.read rescue nil
         sock.close
       end
       return conn
@@ -487,6 +489,9 @@ module Net
             break if data == nil
             yield(data)
           end
+          conn.shutdown(Socket::SHUT_WR)
+          conn.read_timeout = 1
+          conn.read
           conn.close
           voidresp
         end
@@ -508,6 +513,9 @@ module Net
             break if line == nil
             yield(line.sub(/\r?\n\z/, ""), !line.match(/\n\z/).nil?)
           end
+          conn.shutdown(Socket::SHUT_WR)
+          conn.read_timeout = 1
+          conn.read
           conn.close
           voidresp
         end
diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
index 91250a9d28..5a566a52f2 100644
--- a/test/net/ftp/test_ftp.rb
+++ b/test/net/ftp/test_ftp.rb
@@ -271,6 +271,8 @@ class FTPTest < Test::Unit::TestCase
         end
         conn.print(l, "\r\n")
       end
+      conn.shutdown(Socket::SHUT_WR)
+      conn.read
       conn.close
       sock.print("226 Directory send OK.\r\n")
     }
@@ -398,6 +400,7 @@ class FTPTest < Test::Unit::TestCase
             buf << s
           end
         end
+        assert_equal(1024, buf.bytesize)
         assert_equal(binary_data[0, 1024], buf)
         assert_match(/\APORT /, commands.shift)
         assert_equal("RETR foo\r\n", commands.shift)
@@ -434,6 +437,8 @@ class FTPTest < Test::Unit::TestCase
         sleep(0.1)
         conn.print(s)
       end
+      conn.shutdown(Socket::SHUT_WR)
+      conn.read
       conn.close
       sock.print("226 Transfer complete.\r\n")
     }
@@ -450,6 +455,7 @@ class FTPTest < Test::Unit::TestCase
         ftp.retrbinary("RETR foo", 1024) do |s|
           buf << s
         end
+        assert_equal(binary_data.bytesize, buf.bytesize)
         assert_equal(binary_data, buf)
         assert_match(/\APORT /, commands.shift)
         assert_equal("RETR foo\r\n", commands.shift)