Unverified Commit 74dac344 authored by Jan Alexander Steffens (heftig)'s avatar Jan Alexander Steffens (heftig) Committed by Daniel Stenberg
Browse files

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
parent 1f39245d

lib/http.c

+1 −1
Original line number Diff line number Diff line
@@ -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;