diff options
| author | Sven Wegener <sven.wegener@stealer.net> | 2011-08-30 20:20:56 +0200 |
|---|---|---|
| committer | Sven Wegener <sven.wegener@stealer.net> | 2012-10-27 11:55:10 +0200 |
| commit | 4c244c8a0c417e6428e54abcd34aa33b6e647f38 (patch) | |
| tree | fbaee68020a419f0c038daa90d616e2271ec026c /lib/http.c | |
| parent | 74fe1b95fb44053fdbef4b1eb9f550a3da332eda (diff) | |
correctly support CURLOPT_HTTPPROXYTUNNEL for httpsfixes
Currently using an HTTP proxy with HTTPS results in unconditional
CONNECT usage, regardless of CURLOPT_HTTPPROXYTUNNEL. This patch
modifies libcurl to only use tunnel mode, when SSL is used and the
protocol is not HTTP. Setting CURLOPT_HTTPPROXYTUNNEL then forces the
use of CONNECT.
Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
Diffstat (limited to 'lib/http.c')
| -rw-r--r-- | lib/http.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/http.c b/lib/http.c index 0c12d1896..ccb347996 100644 --- a/lib/http.c +++ b/lib/http.c @@ -1321,7 +1321,7 @@ CURLcode Curl_http_connect(struct connectdata *conn, bool *done) /* nothing else to do except wait right now - we're not done here. */ return CURLE_OK; - if(conn->given->flags & PROTOPT_SSL) { + if(conn->given->flags & PROTOPT_SSL && (conn->bits.tunnel_proxy || !conn->bits.httpproxy)) { /* perform SSL initialization */ if(data->state.used_interface == Curl_if_multi) { result = https_connecting(conn, done); |