From 493d6033aa299b614f0edecd86e1eccf95a86a00 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 7 Aug 2005 22:59:06 +0000 Subject: Jon Grubbs filed bug report #1249962 which identified a problem with NTLM on a HTTP proxy if an FTP URL was given. libcurl now properly switches to pure HTTP internally when an HTTP proxy is used, even for FTP URLs. The problem would also occur with other multi-pass auth methods. --- lib/url.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib') diff --git a/lib/url.c b/lib/url.c index f587b79f1..3698affd1 100644 --- a/lib/url.c +++ b/lib/url.c @@ -2651,9 +2651,13 @@ static CURLcode CreateConnection(struct SessionHandle *data, } if(proxy && *proxy) { + long bits = conn->protocol & (PROT_HTTPS|PROT_SSL); data->change.proxy = proxy; data->change.proxy_alloc=TRUE; /* this needs to be freed later */ conn->bits.httpproxy = TRUE; + + /* force this to become HTTP */ + conn->protocol = PROT_HTTP | bits; } } /* if (!nope) - it wasn't specified non-proxy */ } /* NO_PROXY wasn't specified or '*' */ @@ -2789,6 +2793,7 @@ static CURLcode CreateConnection(struct SessionHandle *data, #ifndef CURL_DISABLE_HTTP conn->curl_do = Curl_http; conn->curl_done = Curl_http_done; + conn->protocol = PROT_HTTP; /* switch to HTTP */ #else failf(data, "FTP over http proxy requires HTTP support built-in!"); return CURLE_UNSUPPORTED_PROTOCOL; -- cgit v1.2.3