From 817323ed822ef16d7551315b7a74cf9a6c9e07af Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 22 May 2015 09:06:44 +0200 Subject: parse_proxy: switch off tunneling if non-HTTP proxy non-HTTP proxy implies not using CURLOPT_HTTPPROXYTUNNEL Bug: http://curl.haxx.se/mail/lib-2015-05/0056.html Reported-by: Sean Boudreau --- lib/url.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/url.c b/lib/url.c index 1b57ef102..17279bbe0 100644 --- a/lib/url.c +++ b/lib/url.c @@ -4518,7 +4518,6 @@ static char *detect_proxy(struct connectdata *conn) * If this is supposed to use a proxy, we need to figure out the proxy * host name, so that we can re-use an existing connection * that may exist registered to the same proxy host. - * proxy will be freed before this function returns. */ static CURLcode parse_proxy(struct SessionHandle *data, struct connectdata *conn, char *proxy) @@ -5566,8 +5565,10 @@ static CURLcode create_conn(struct SessionHandle *data, conn->bits.httpproxy = TRUE; #endif } - else + else { conn->bits.httpproxy = FALSE; /* not a HTTP proxy */ + conn->bits.tunnel_proxy = FALSE; /* no tunneling if not HTTP */ + } conn->bits.proxy = TRUE; } else { -- cgit v1.2.3