Commit 2ad0a7d2 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

minor fix to make better bail-out check

parent 481094db

lib/ftp.c

+4 −5
Original line number Diff line number Diff line
@@ -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,