diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-27 08:05:43 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-27 08:05:43 +0000 |
commit | 52832c4db06949623620033c9383413707e7d205 (patch) | |
tree | fb9a97c86caea71e531d47424ac699ed8b39c28f /lib | |
parent | 2c1a9c3db35785087bba6624d7df5130be8ab97e (diff) |
merge revision(s) 46182: [Backport #9872]
* lib/net/ftp.rb (transfercmd): Close TCP server socket even if an
exception occur.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/net/ftp.rb | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 805321c9d1..c2cf5f3af4 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -419,23 +419,26 @@ module Net end else sock = makeport - if @resume and rest_offset - resp = sendcmd("REST " + rest_offset.to_s) - if resp[0] != ?3 + begin + if @resume and rest_offset + resp = sendcmd("REST " + rest_offset.to_s) + if resp[0] != ?3 + raise FTPReplyError, resp + end + end + resp = sendcmd(cmd) + # skip 2XX for some ftp servers + resp = getresp if resp[0] == ?2 + if resp[0] != ?1 raise FTPReplyError, resp end + conn = BufferedSocket.new(sock.accept) + conn.read_timeout = @read_timeout + sock.shutdown(Socket::SHUT_WR) rescue nil + sock.read rescue nil + ensure + sock.close end - resp = sendcmd(cmd) - # skip 2XX for some ftp servers - resp = getresp if resp[0] == ?2 - if resp[0] != ?1 - raise FTPReplyError, resp - end - conn = BufferedSocket.new(sock.accept) - conn.read_timeout = @read_timeout - sock.shutdown(Socket::SHUT_WR) rescue nil - sock.read rescue nil - sock.close end return conn end |