diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-04-04 16:24:37 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-04-04 19:38:00 +0200 |
| commit | 02dbfa21921aded6bba292b99dd224fe450e7254 (patch) | |
| tree | 73794776eccad853522867c7c755b0bdeda3672f /lib/ftp.c | |
| parent | 9d1e914a56e8a4030d8917875eaedaddf5cff97c (diff) | |
| download | curl-02dbfa21921aded6bba292b99dd224fe450e7254.tar.gz | |
http-proxy: move proxy code to http_proxy.c
The new http_proxy.* files now host HTTP proxy specific code (500+ lines
moved out from http.c), and as a consequence there is a macro introduced
for the Curl_proxyCONNECT() function so that code can use it without
actually supporting proxy (or HTTP) in builds.
Diffstat (limited to 'lib/ftp.c')
| -rw-r--r-- | lib/ftp.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -93,6 +93,7 @@ #include "rawstr.h" #include "speedcheck.h" #include "warnless.h" +#include "http_proxy.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -1744,7 +1745,7 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn, result = CURLE_COULDNT_CONNECT; break; } -#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 */ @@ -1770,7 +1771,7 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn, if(CURLE_OK != result) return result; } -#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_PROXY */ + state(conn, FTP_STOP); /* this phase is completed */ |