moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

parse_proxy: switch off tunneling if non-HTTP proxy

Browse Source 
non-HTTP proxy implies not using CURLOPT_HTTPPROXYTUNNEL

Bug: http://curl.haxx.se/mail/lib-2015-05/0056.html
Reported-by: Sean Boudreau
This commit is contained in:
Daniel Stenberg 2015-05-22 09:06:44 +02:00
parent 42ed88e70a
commit 817323ed82
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/url.c
View File

@ -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 * 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 * host name, so that we can re-use an existing connection
* that may exist registered to the same proxy host. * that may exist registered to the same proxy host.
* proxy will be freed before this function returns.
*/ */
static CURLcode parse_proxy(struct SessionHandle *data, static CURLcode parse_proxy(struct SessionHandle *data,
struct connectdata *conn, char *proxy) struct connectdata *conn, char *proxy)
@ -5566,8 +5565,10 @@ static CURLcode create_conn(struct SessionHandle *data,
conn->bits.httpproxy = TRUE; conn->bits.httpproxy = TRUE;
#endif #endif
} }
else else {
conn->bits.httpproxy = FALSE; /* not a HTTP proxy */ conn->bits.httpproxy = FALSE; /* not a HTTP proxy */
conn->bits.tunnel_proxy = FALSE; /* no tunneling if not HTTP */
}
conn->bits.proxy = TRUE; conn->bits.proxy = TRUE;
} }
else { else {