aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/http.c6
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:"",