diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2009-01-30 19:29:25 +0000 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2009-01-30 19:29:25 +0000 |
| commit | 09f4a1c5e5acddeacb605ce2382fd027e6b50393 (patch) | |
| tree | 7494d205fcaef9f7984baf6cf3de1ac07a517160 /lib | |
| parent | 5c9fff9c6e72268f9d09d16de6d3021b16f9e42c (diff) | |
Fixed --disable-proxy for FTP and SOCKS. Thanks to Daniel Egger for reporting
the problem.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ftp.c | 8 | ||||
| -rw-r--r-- | lib/socks_gssapi.c | 4 |
2 files changed, 8 insertions, 4 deletions
@@ -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 */ diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c index cd9e1a4d3..d948168d4 100644 --- a/lib/socks_gssapi.c +++ b/lib/socks_gssapi.c @@ -23,6 +23,8 @@ #include "setup.h" +#ifndef CURL_DISABLE_PROXY + #ifdef HAVE_GSSAPI #ifdef HAVE_OLD_GSSMIT #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name @@ -545,3 +547,5 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, return CURLE_OK; } #endif + +#endif /* CURL_DISABLE_PROXY */ |