aboutsummaryrefslogtreecommitdiff
path: root/lib/ftp.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2003-09-03 21:44:59 +0000
committerDaniel Stenberg <daniel@haxx.se>2003-09-03 21:44:59 +0000
commit2ad0a7d20fba43ba6d2de7efdd556ed768e0f50f (patch)
tree13c0784f4222a2ca45ea87657808739e232f01bd /lib/ftp.c
parent481094db905dbc4b1eb6c70519b0b3b1487415ef (diff)
minor fix to make better bail-out check
Diffstat (limited to 'lib/ftp.c')
-rw-r--r--lib/ftp.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index b9380277c..529460577 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -1518,20 +1518,19 @@ CURLcode ftp_use_pasv(struct connectdata *conn,
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
* 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.
*/
- if((CURLE_OK == result) &&
- data->set.verbose)
+ if(data->set.verbose)
/* this just dumps information about this second connection */
ftp_pasv_verbose(conn, conninfo, newhostp, connectport);
- if(CURLE_OK != result)
- return result;
-
if (data->set.tunnel_thru_httpproxy) {
/* We want "seamless" FTP operations through HTTP proxy tunnel */
result = Curl_ConnectHTTPProxyTunnel(conn, conn->secondarysocket,