From 0c8e5f7e6ac13c43b8cbab8dcada56d3f27a2a89 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 27 Oct 2010 10:54:35 +0200 Subject: ftp: prevent server from hanging on closed data connection Some FTP servers (e.g. Pure-ftpd) end up hanging if we close the data connection before transferring all the requested data. If we send ABOR in that case, it prevents the server from hanging. Bug: https://bugzilla.redhat.com/643656 Reported by: Pasi Karkkainen, Patrick Monnerat --- lib/ftp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/ftp.c b/lib/ftp.c index b5a4fd5be..679f2334c 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -3083,6 +3083,11 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status, #endif if(conn->sock[SECONDARYSOCKET] != CURL_SOCKET_BAD) { + if(!result && ftpc->dont_check) + /* prevent some FTP servers (namely Pure-ftpd) from hanging if we close + * the data channel before transferring all data */ + result = Curl_pp_sendf(&ftpc->pp, "ABOR"); + if(conn->ssl[SECONDARYSOCKET].use) { /* The secondary socket is using SSL so we must close down that part first before we close the socket for real */ @@ -3097,7 +3102,7 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status, } } - if((ftp->transfer == FTPTRANSFER_BODY) && ftpc->ctl_valid && + if(!result && (ftp->transfer == FTPTRANSFER_BODY) && ftpc->ctl_valid && pp->pending_resp && !premature) { /* * Let's see what the server says about the transfer we just performed, -- cgit v1.2.3