Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > d9ddda38bea0a82913a78970e9fa54e1 > files > 4

curl-7.21.5-1.2.mga1.src.rpm

commit c2c89481909de99e37f4aee46c8bc1b1358a5988
Author: Daniel Stenberg <daniel@haxx.se>
Date:   Wed Apr 20 22:50:04 2011 +0200

    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 960bb42..1e463ee 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);