From 4452f448ce7c78fefbc8d7ea89adf4e24c8a8880 Mon Sep 17 00:00:00 2001 From: shugo Date: Tue, 6 Feb 2007 02:19:01 +0000 Subject: * lib/net/ftp.rb: check the control connection on EPIPE. Thanks, Simon Williams. [ruby-core:9547] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/net/ftp.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'lib/net') diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index fe244f077..26f4da277 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -291,6 +291,13 @@ module Net putline(cmd) voidresp end + rescue Errno::EPIPE + # EPIPE, in this case, means that the data connection was unexpectedly + # terminated. Rather than just raising EPIPE to the caller, check the + # response on the control connection. If getresp doesn't raise a more + # appropriate exception, re-raise the original exception. + getresp + raise end def sendport(host, port) @@ -427,6 +434,13 @@ module Net voidresp end end + rescue Errno::EPIPE + # EPIPE, in this case, means that the data connection was unexpectedly + # terminated. Rather than just raising EPIPE to the caller, check the + # response on the control connection. If getresp doesn't raise a more + # appropriate exception, re-raise the original exception. + getresp + raise end # -- cgit