aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-04-20 22:50:04 +0200
committerDaniel Stenberg <daniel@haxx.se>2011-04-20 22:50:04 +0200
commitc2c89481909de99e37f4aee46c8bc1b1358a5988 (patch)
tree47e3f1012ef789bc659e4ac3fdcd9c65b3eb091c /lib
parentc6a0abdd975848dca03f93e7ff1dd4550bda7c0a (diff)
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
Diffstat (limited to 'lib')
-rw-r--r--lib/http.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/http.c b/lib/http.c
index 960bb4279..1e463ee69 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);