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>

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/url.c b/lib/url.c
index b30a4fa51..1c07c2be8 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -5084,7 +5084,7 @@ static CURLcode create_conn(struct SessionHandle *data,
    * If the protocol is using SSL and HTTP proxy is used, we set
    * the tunnel_proxy bit.
    *************************************************************/
-  if((conn->given->flags&PROTOPT_SSL) && conn->bits.httpproxy)
+  if((conn->given->flags&PROTOPT_SSL) && conn->bits.httpproxy && !(conn->handler->protocol & CURLPROTO_HTTP))
     conn->bits.tunnel_proxy = TRUE;
 
   /*************************************************************