diff options
Diffstat (limited to 'lib/http.c')
| -rw-r--r-- | lib/http.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/http.c b/lib/http.c index 6bba43dda..35cae48e8 100644 --- a/lib/http.c +++ b/lib/http.c @@ -420,7 +420,7 @@ CURLcode Curl_http_connect(struct connectdata *conn) * has occured, can we start talking SSL */ - if(data->change.proxy && (data->set.proxytype == CURLPROXY_HTTP) && + if(conn->bits.httpproxy && ((conn->protocol & PROT_HTTPS) || data->set.tunnel_thru_httpproxy)) { /* either HTTPS over proxy, OR explicitly asked for a tunnel */ @@ -551,7 +551,7 @@ CURLcode Curl_http(struct connectdata *conn) host, ppath, (conn->protocol&PROT_HTTPS?TRUE:FALSE)); } - if (data->change.proxy && + if (data->change.proxy && *data->change.proxy && !data->set.tunnel_thru_httpproxy && !(conn->protocol&PROT_HTTPS)) { /* The path sent to the proxy is in fact the entire URL */ |