From: Stefan Eissing <stefan@eissing.org>
Date: Wed, 28 Aug 2024 10:26:19 +0000 (+0200)
Subject: urldata: remove proxy_connect_closed bit
X-Git-Tag: curl-8_10_0~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9280bbea3f45536d528383fbd1cdc1700ce31e72;p=thirdparty%2Fcurl.git

urldata: remove proxy_connect_closed bit

The connections 'proxy_connect_closed' bit was not used any more. Remove
it.

Closes #14708
---

diff --git a/lib/multi.c b/lib/multi.c
index 9aeb60a140..057d70d5ab 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -2014,22 +2014,12 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
       /* this is HTTP-specific, but sending CONNECT to a proxy is HTTP... */
       DEBUGASSERT(data->conn);
       result = Curl_http_connect(data, &protocol_connected);
-#ifndef CURL_DISABLE_PROXY
-      if(data->conn->bits.proxy_connect_closed) {
+      if(!result) {
         rc = CURLM_CALL_MULTI_PERFORM;
-        /* connect back to proxy again */
-        result = CURLE_OK;
-        multi_done(data, CURLE_OK, FALSE);
-        multistate(data, MSTATE_CONNECT);
+        /* initiate protocol connect phase */
+        multistate(data, MSTATE_PROTOCONNECT);
       }
       else
-#endif
-        if(!result) {
-          rc = CURLM_CALL_MULTI_PERFORM;
-          /* initiate protocol connect phase */
-          multistate(data, MSTATE_PROTOCONNECT);
-        }
-      else
         stream_error = TRUE;
       break;
 #endif
diff --git a/lib/url.c b/lib/url.c
index 1d9d652bd6..276715509e 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3671,14 +3671,6 @@ CURLcode Curl_setup_conn(struct Curl_easy *data,
     return result;
   }
 
-#ifndef CURL_DISABLE_PROXY
-  /* set proxy_connect_closed to false unconditionally already here since it
-     is used strictly to provide extra information to a parent function in the
-     case of proxy CONNECT failures and we must make sure we do not have it
-     lingering set from a previous invoke */
-  conn->bits.proxy_connect_closed = FALSE;
-#endif
-
 #ifdef CURL_DO_LINEEND_CONV
   data->state.crlf_conversions = 0; /* reset CRLF conversion counter */
 #endif /* CURL_DO_LINEEND_CONV */
diff --git a/lib/urldata.h b/lib/urldata.h
index f0b6d59575..7182f3edc4 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -501,9 +501,6 @@ struct ConnectBits {
                          This is implicit when SSL-protocols are used through
                          proxies, but can also be enabled explicitly by
                          apps */
-  BIT(proxy_connect_closed); /* TRUE if a proxy disconnected the connection
-                                in a CONNECT request with auth, so that
-                                libcurl should reconnect and continue. */
   BIT(proxy); /* if set, this transfer is done through a proxy - any type */
 #endif
   /* always modify bits.close with the connclose() and connkeep() macros! */