aboutsummaryrefslogtreecommitdiff
path: root/lib/http.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2002-08-30 09:20:11 +0000
committerDaniel Stenberg <daniel@haxx.se>2002-08-30 09:20:11 +0000
commit8aa3f143035ad982acb6e596a8653ac41a7860cc (patch)
treee6d92edfc7883f0ffe14904dc151b4483e4d0e74 /lib/http.c
parentac285b453e0db7c4cd327f4dc4845871ce26f7fa (diff)
SOCKS5 support added (contributed by a still unnamed person). Not properly
working for "IPv6 enabled" libcurls yet, but should be pretty easy for someone to adjust.
Diffstat (limited to 'lib/http.c')
-rw-r--r--lib/http.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/http.c b/lib/http.c
index 66fa234ec..08a5536dc 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 &&
+ if(data->change.proxy && (data->set.proxytype == CURLPROXY_HTTP) &&
((conn->protocol & PROT_HTTPS) || data->set.tunnel_thru_httpproxy)) {
/* either HTTPS over proxy, OR explicitly asked for a tunnel */