Commit 80d2df77 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Reverted my change to use Curl_connected_proxy() here. Clearly I wasn't 

thinking straight.
parent f882a63c

lib/ftp.c

+27 −5
Original line number Original line Diff line number Diff line
@@ -1890,11 +1890,33 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn, 
    /* this just dumps information about this second connection */

    /* this just dumps information about this second connection */

    ftp_pasv_verbose(conn, conninfo, newhost, connectport);

    ftp_pasv_verbose(conn, conninfo, newhost, connectport);





  switch(data->set.proxytype) {

#ifndef CURL_DISABLE_PROXY

    /* FIX: this MUST wait for a proper connect first if 'connected' is

    /* FIX: this MUST wait for a proper connect first if 'connected' is

     FALSE to make proxies work properly here! */

     * FALSE */

  result = Curl_connected_proxy(conn);

  case CURLPROXY_SOCKS5:

  if(result)

  case CURLPROXY_SOCKS5_HOSTNAME:

    return result;

    result = Curl_SOCKS5(conn->proxyuser, conn->proxypasswd, newhost, newport,

                         SECONDARYSOCKET, conn);

    break;

  case CURLPROXY_SOCKS4:

    result = Curl_SOCKS4(conn->proxyuser, newhost, newport,

                         SECONDARYSOCKET, conn, FALSE);

    break;

  case CURLPROXY_SOCKS4A:

    result = Curl_SOCKS4(conn->proxyuser, newhost, newport,

                         SECONDARYSOCKET, conn, TRUE);

    break;

#endif /* CURL_DISABLE_PROXY */

  case CURLPROXY_HTTP:

  case CURLPROXY_HTTP_1_0:

    /* do nothing here. handled later. */

    break;

  default:

    failf(data, "unknown proxytype option given");

    result = CURLE_COULDNT_CONNECT;

    break;

  }

#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)

#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)

  if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {

  if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {

    /* FIX: this MUST wait for a proper connect first if 'connected' is

    /* FIX: this MUST wait for a proper connect first if 'connected' is