diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2003-05-27 06:28:25 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2003-05-27 06:28:25 +0000 |
| commit | 90b0f38316ce59d24d254e4f46d46bc08174b854 (patch) | |
| tree | 6d0373da6fc3a0f3d1f8fe5441c2d2754ce998a8 /lib/http.c | |
| parent | 18f630ab21066e14983bae69b357b6b6f8b5c5b1 (diff) | |
Another socks5-fix. Make sure that when we use a socks-proxy, it is not the
same as using a httpproxy so we must make sure to better check for http
proxies before we do HTTP proxy stuff. This included authorization and
URI usage in the request etc.
Diffstat (limited to 'lib/http.c')
| -rw-r--r-- | lib/http.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/http.c b/lib/http.c index 0d2996c03..d63eb6b55 100644 --- a/lib/http.c +++ b/lib/http.c @@ -791,7 +791,7 @@ CURLcode Curl_http(struct connectdata *conn) (bool)(conn->protocol&PROT_HTTPS?TRUE:FALSE)); } - if (data->change.proxy && *data->change.proxy && + if (conn->bits.httpproxy && !data->set.tunnel_thru_httpproxy && !(conn->protocol&PROT_HTTPS)) { /* The path sent to the proxy is in fact the entire URL */ @@ -936,8 +936,8 @@ CURLcode Curl_http(struct connectdata *conn) request, ppath, httpstring, - (conn->bits.proxy_user_passwd && - conn->allocptr.proxyuserpwd)?conn->allocptr.proxyuserpwd:"", + (conn->bits.httpproxy && conn->allocptr.proxyuserpwd)? + conn->allocptr.proxyuserpwd:"", conn->allocptr.userpwd?conn->allocptr.userpwd:"", (conn->bits.use_range && conn->allocptr.rangeline)? conn->allocptr.rangeline:"", |