moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 03:55:03 -05:00
Code Issues Releases Wiki Activity

Fixed --disable-proxy for FTP and SOCKS. Thanks to Daniel Egger for reporting

Browse Source 
the problem.
This commit is contained in:
Dan Fandrich 2009-01-30 19:29:25 +00:00
parent 5c9fff9c6e
commit 09f4a1c5e5
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -6,6 +6,10 @@
Changelog Changelog
Daniel Fandrich (30 Jan 2009)
- Fixed --disable-proxy for FTP and SOCKS. Thanks to Daniel Egger for
reporting.
Yang Tse (29 Jan 2009) Yang Tse (29 Jan 2009)
- Introduced curl_sspi.c and curl_sspi.h for the implementation of functions - Introduced curl_sspi.c and curl_sspi.h for the implementation of functions
Curl_sspi_global_init() and Curl_sspi_global_cleanup() which previously were Curl_sspi_global_init() and Curl_sspi_global_cleanup() which previously were

8
lib/ftp.c
View File

@ -1901,7 +1901,7 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
result = CURLE_COULDNT_CONNECT; result = CURLE_COULDNT_CONNECT;
break; break;
} }
#ifndef CURL_DISABLE_HTTP #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
* FALSE */ * FALSE */
@ -1927,7 +1927,7 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
if(CURLE_OK != result) if(CURLE_OK != result)
return result; return result;
} }
#endif /* CURL_DISABLE_HTTP */ #endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_PROXY */
state(conn, FTP_STOP); /* this phase is completed */ 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 */ 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) { if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {
/* BLOCKING */ /* BLOCKING */
/* We want "seamless" FTP operations through HTTP proxy tunnel */ /* We want "seamless" FTP operations through HTTP proxy tunnel */
@ -3083,7 +3083,7 @@ static CURLcode ftp_connect(struct connectdata *conn,
if(CURLE_OK != result) if(CURLE_OK != result)
return result; return result;
} }
#endif /* CURL_DISABLE_HTTP */ #endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_PROXY */
if(conn->protocol & PROT_FTPS) { if(conn->protocol & PROT_FTPS) {
/* BLOCKING */ /* BLOCKING */

4
lib/socks_gssapi.c
View File

@ -23,6 +23,8 @@
#include "setup.h" #include "setup.h"
#ifndef CURL_DISABLE_PROXY
#ifdef HAVE_GSSAPI #ifdef HAVE_GSSAPI
#ifdef HAVE_OLD_GSSMIT #ifdef HAVE_OLD_GSSMIT
#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
@ -545,3 +547,5 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
return CURLE_OK; return CURLE_OK;
} }
#endif #endif
#endif /* CURL_DISABLE_PROXY */