From 2ad0a7d20fba43ba6d2de7efdd556ed768e0f50f Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 3 Sep 2003 21:44:59 +0000 Subject: minor fix to make better bail-out check --- lib/ftp.c | 9 ++++----- 1 file 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, -- cgit v1.2.3