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: Shutdown gracefully.

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

(limited to 'lib/net')

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
-- 
cgit v1.2.3