moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-01 09:51:46 -05:00
Code Issues Releases Wiki Activity

minor fix to make better bail-out check

Browse Source
This commit is contained in:
Daniel Stenberg 2003-09-03 21:44:59 +00:00
parent 481094db90
commit 2ad0a7d20f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ftp.c
View File

@ -1518,20 +1518,19 @@ CURLcode ftp_use_pasv(struct connectdata *conn,
Curl_resolv_unlock(data, addr); /* we're done using this address */ Curl_resolv_unlock(data, addr); /* we're done using this address */
if(result)
return result;
/* /*
* When this is used from the multi interface, this might've returned with * When this is used from the multi interface, this might've returned with
* the 'connected' set to FALSE and thus we are now awaiting a non-blocking * the 'connected' set to FALSE and thus we are now awaiting a non-blocking
* connect to connect and we should not be "hanging" here waiting. * connect to connect and we should not be "hanging" here waiting.
*/ */
if((CURLE_OK == result) && if(data->set.verbose)
data->set.verbose)
/* this just dumps information about this second connection */ /* this just dumps information about this second connection */
ftp_pasv_verbose(conn, conninfo, newhostp, connectport); ftp_pasv_verbose(conn, conninfo, newhostp, connectport);
if(CURLE_OK != result)
return result;
if (data->set.tunnel_thru_httpproxy) { if (data->set.tunnel_thru_httpproxy) {
/* We want "seamless" FTP operations through HTTP proxy tunnel */ /* We want "seamless" FTP operations through HTTP proxy tunnel */
result = Curl_ConnectHTTPProxyTunnel(conn, conn->secondarysocket, result = Curl_ConnectHTTPProxyTunnel(conn, conn->secondarysocket,