From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 20 Apr 2011 20:50:04 +0000 (+0200)
Subject: Curl_http_connect: detect HTTPS properly after CONNECT
X-Git-Tag: curl-7_21_6~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2c89481909de99e37f4aee46c8bc1b1358a5988;p=thirdparty%2Fcurl.git

Curl_http_connect: detect HTTPS properly after CONNECT

libcurl failed to check the correct struct for HTTPS after CONNECT was
issued to the proxy, so it didn't do the TLS handshake and subsequently
failed the connection. A regression released in 7.21.5 (introduced
around commit 8831000bc07de).

Bug: http://curl.haxx.se/mail/lib-2011-04/0134.html
Reported by: Josue Andrade Gomes
---

diff --git a/lib/http.c b/lib/http.c
index 960bb42794..1e463ee692 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -1303,7 +1303,7 @@ CURLcode Curl_http_connect(struct connectdata *conn, bool *done)
   }
 #endif /* CURL_DISABLE_PROXY */
 
-  if(conn->handler->protocol & CURLPROTO_HTTPS) {
+  if(conn->given->protocol & CURLPROTO_HTTPS) {
     /* perform SSL initialization */
     if(data->state.used_interface == Curl_if_multi) {
       result = https_connecting(conn, done);