aboutsummaryrefslogtreecommitdiff
path: root/lib/http.c
diff options
context:
space:
mode:
authorMichael Kaufmann <mail@michael-kaufmann.ch>2017-03-10 23:57:09 +0100
committerMichael Kaufmann <mail@michael-kaufmann.ch>2017-03-11 18:59:01 +0100
commite84a863dc37f81bca066838a76e1b461c3cabeaf (patch)
treef7168a8de8688e9270f843018c7b3e8c68b27267 /lib/http.c
parent0afbcfd800c45e766e225e4ce273b128ee6a8c25 (diff)
proxy: skip SSL initialization for closed connections
This prevents a "Descriptor is not a socket" error for WinSSL. Reported-by: Antony74@users.noreply.github.com Reviewed-by: Jay Satiro Fixes https://github.com/curl/curl/issues/1239
Diffstat (limited to 'lib/http.c')
-rw-r--r--lib/http.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/http.c b/lib/http.c
index ebc005060..3f3553abb 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -1359,6 +1359,10 @@ CURLcode Curl_http_connect(struct connectdata *conn, bool *done)
if(result)
return result;
+ if(conn->bits.proxy_connect_closed)
+ /* this is not an error, just part of the connection negotiation */
+ return CURLE_OK;
+
if(CONNECT_FIRSTSOCKET_PROXY_SSL())
return CURLE_OK; /* wait for HTTPS proxy SSL initialization to complete */