moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

FTP: wait on both connections during active STOR state 

When doing PORT and upload (STOR), this function needs to extract the
file descriptor for both connections so that it will respond immediately
when the server eventually connects back.

This flaw caused active connections to become unnecessary slow but they
would still often work due to the normal polling on a timeout. The bug
also would not occur if the server connected back very fast, like when
testing on local networks.

Bug: http://curl.haxx.se/bug/view.cgi?id=1183
Reported by: Daniel Theron
This commit is contained in:
Daniel Stenberg 2013-04-05 08:39:24 +02:00
parent 9474c4a9a5
commit 57aeabcc1a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ftp.c
View File

@ -878,14 +878,16 @@ static int ftp_domore_getsock(struct connectdata *conn, curl_socket_t *socks,
remote site, or we could wait for that site to connect to us. Or just
handle ordinary commands.
When waiting for a connect, we will be in FTP_STOP state and then we wait
for the secondary socket to become writeable. If we're in another state,
we're still handling commands on the control (primary) connection.
When waiting for a connect, we can be in FTP_STOP state (or we're in
FTP_STOR when we do an upload) and then we wait for the secondary socket
to become writeable. . If we're in another state, we're still handling
commands on the control (primary) connection.
*/
switch(ftpc->state) {
case FTP_STOP:
case FTP_STOR:
break;
default:
return Curl_pp_getsock(&conn->proto.ftpc.pp, socks, numsocks);