generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ftp: prevent server from hanging on closed data connection

Browse Source 
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
This commit is contained in:
Kamil Dudka
2010-10-27 10:54:35 +02:00
parent 59db31902c
commit 0c8e5f7e6a
6 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ftp.c
View File

@@ -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,