diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-08-18 10:43:02 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-08-18 15:25:22 +0200 |
| commit | 74dac344b2feb2e0f4baddb70532dc8e45d2d817 (patch) | |
| tree | 96e29a524ed5a407ef9e01d0946466db6063bed3 | |
| parent | 1f39245dc8da51dcd81e5aed2fdd5d1f7ebbe23b (diff) | |
| download | curl-74dac344b2feb2e0f4baddb70532dc8e45d2d817.tar.gz | |
http: Don't wait on CONNECT when there is no proxy
Since curl 7.55.0, NetworkManager almost always failed its connectivity
check by timeout. I bisected this to 5113ad04 (http-proxy: do the HTTP
CONNECT process entirely non-blocking).
This patch replaces !Curl_connect_complete with Curl_connect_ongoing,
which returns false if the CONNECT state was left uninitialized and lets
the connection continue.
Closes #1803
Fixes #1804
Also-fixed-by: Gergely Nagy
| -rw-r--r-- | lib/http.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/http.c b/lib/http.c index 35c7c3d43..3e3313278 100644 --- a/lib/http.c +++ b/lib/http.c @@ -1371,7 +1371,7 @@ CURLcode Curl_http_connect(struct connectdata *conn, bool *done) if(CONNECT_FIRSTSOCKET_PROXY_SSL()) return CURLE_OK; /* wait for HTTPS proxy SSL initialization to complete */ - if(!Curl_connect_complete(conn)) + if(Curl_connect_ongoing(conn)) /* nothing else to do except wait right now - we're not done here. */ return CURLE_OK; |