generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
thinking straight.
This commit is contained in:
Daniel Stenberg 2009-05-12 18:56:33 +00:00
parent f882a63cba
commit 80d2df7789
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/ftp.c
View File

@ -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);
/* FIX: this MUST wait for a proper connect first if 'connected' is switch(data->set.proxytype) {
FALSE to make proxies work properly here! */ #ifndef CURL_DISABLE_PROXY
result = Curl_connected_proxy(conn); /* FIX: this MUST wait for a proper connect first if 'connected' is
if(result) * FALSE */
return result; case CURLPROXY_SOCKS5:
case CURLPROXY_SOCKS5_HOSTNAME:
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