From 09f4a1c5e5acddeacb605ce2382fd027e6b50393 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Fri, 30 Jan 2009 19:29:25 +0000 Subject: Fixed --disable-proxy for FTP and SOCKS. Thanks to Daniel Egger for reporting the problem. --- lib/ftp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/ftp.c') diff --git a/lib/ftp.c b/lib/ftp.c index 66933d673..0723abe7e 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -1901,7 +1901,7 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn, result = CURLE_COULDNT_CONNECT; break; } -#ifndef CURL_DISABLE_HTTP +#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY) if(conn->bits.tunnel_proxy && conn->bits.httpproxy) { /* FIX: this MUST wait for a proper connect first if 'connected' is * FALSE */ @@ -1927,7 +1927,7 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn, if(CURLE_OK != result) return result; } -#endif /* CURL_DISABLE_HTTP */ +#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_PROXY */ state(conn, FTP_STOP); /* this phase is completed */ @@ -3060,7 +3060,7 @@ static CURLcode ftp_connect(struct connectdata *conn, ftpc->response_time = RESP_TIMEOUT; /* set default response time-out */ -#ifndef CURL_DISABLE_HTTP +#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY) if(conn->bits.tunnel_proxy && conn->bits.httpproxy) { /* BLOCKING */ /* We want "seamless" FTP operations through HTTP proxy tunnel */ @@ -3083,7 +3083,7 @@ static CURLcode ftp_connect(struct connectdata *conn, if(CURLE_OK != result) return result; } -#endif /* CURL_DISABLE_HTTP */ +#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_PROXY */ if(conn->protocol & PROT_FTPS) { /* BLOCKING */ -- cgit v1.2.3