libcurl: update to 8.9.0

1 files changed, 94 insertions, 8 deletions

diff --git a/libs/libcurl/src/connect.c b/libs/libcurl/src/connect.c
index 7ca66eaea1..f31a4d7c88 100644
--- a/libs/libcurl/src/connect.c
+++ b/libs/libcurl/src/connect.c
@@ -90,7 +90,7 @@
 

 /*

  * Curl_timeleft() returns the amount of milliseconds left allowed for the

- * transfer/connection. If the value is 0, there's no timeout (ie there's

+ * transfer/connection. If the value is 0, there is no timeout (ie there is

  * infinite time left). If the value is negative, the timeout time has already

  * elapsed.

  * @param data the transfer to check on

@@ -142,6 +142,49 @@ timediff_t Curl_timeleft(struct Curl_easy *data,
   return (ctimeleft_ms < timeleft_ms)? ctimeleft_ms : timeleft_ms;

 }

 

+void Curl_shutdown_start(struct Curl_easy *data, int sockindex,

+                         struct curltime *nowp)

+{

+  struct curltime now;

+

+  DEBUGASSERT(data->conn);

+  if(!nowp) {

+    now = Curl_now();

+    nowp = &now;

+  }

+  data->conn->shutdown.start[sockindex] = *nowp;

+  data->conn->shutdown.timeout_ms = (data->set.shutdowntimeout > 0) ?

+    data->set.shutdowntimeout : DEFAULT_SHUTDOWN_TIMEOUT_MS;

+}

+

+timediff_t Curl_shutdown_timeleft(struct connectdata *conn, int sockindex,

+                                  struct curltime *nowp)

+{

+  struct curltime now;

+

+  if(!conn->shutdown.start[sockindex].tv_sec || !conn->shutdown.timeout_ms)

+    return 0; /* not started or no limits */

+

+  if(!nowp) {

+    now = Curl_now();

+    nowp = &now;

+  }

+  return conn->shutdown.timeout_ms -

+         Curl_timediff(*nowp, conn->shutdown.start[sockindex]);

+}

+

+void Curl_shutdown_clear(struct Curl_easy *data, int sockindex)

+{

+  struct curltime *pt = &data->conn->shutdown.start[sockindex];

+  memset(pt, 0, sizeof(*pt));

+}

+

+bool Curl_shutdown_started(struct Curl_easy *data, int sockindex)

+{

+  struct curltime *pt = &data->conn->shutdown.start[sockindex];

+  return (pt->tv_sec > 0) || (pt->tv_usec > 0);

+}

+

 /* Copies connection info into the transfer handle to make it available when

    the transfer handle is no longer associated with the connection. */

 void Curl_persistconninfo(struct Curl_easy *data, struct connectdata *conn,

@@ -317,7 +360,7 @@ void Curl_conncontrol(struct connectdata *conn,
 #endif

   )

 {

-  /* close if a connection, or a stream that isn't multiplexed. */

+  /* close if a connection, or a stream that is not multiplexed. */

   /* This function will be called both before and after this connection is

      associated with a transfer. */

   bool closeit, is_multiplex;

@@ -358,6 +401,7 @@ struct eyeballer {
   BIT(has_started);                  /* attempts have started */

   BIT(is_done);                      /* out of addresses/time */

   BIT(connected);                    /* cf has connected */

+  BIT(shutdown);                     /* cf has shutdown */

   BIT(inconclusive);                 /* connect was not a hard failure, we

                                       * might talk to a restarting server */

 };

@@ -464,7 +508,7 @@ static void baller_initiate(struct Curl_cfilter *cf,
   CURLcode result;

 

 

-  /* Don't close a previous cfilter yet to ensure that the next IP's

+  /* Do not close a previous cfilter yet to ensure that the next IP's

      socket gets a different file descriptor, which can prevent bugs when

      the curl_multi_socket_action interface is used with certain select()

      replacements such as kqueue. */

@@ -744,7 +788,7 @@ evaluate:
 }

 

 /*

- * Connect to the given host with timeout, proxy or remote doesn't matter.

+ * Connect to the given host with timeout, proxy or remote does not matter.

  * There might be more than one IP address to try out.

  */

 static CURLcode start_connect(struct Curl_cfilter *cf,

@@ -857,6 +901,46 @@ static void cf_he_ctx_clear(struct Curl_cfilter *cf, struct Curl_easy *data)
   ctx->winner = NULL;

 }

 

+static CURLcode cf_he_shutdown(struct Curl_cfilter *cf,

+                               struct Curl_easy *data, bool *done)

+{

+  struct cf_he_ctx *ctx = cf->ctx;

+  size_t i;

+  CURLcode result = CURLE_OK;

+

+  DEBUGASSERT(data);

+  if(cf->connected) {

+    *done = TRUE;

+    return CURLE_OK;

+  }

+

+  /* shutdown all ballers that have not done so already. If one fails,

+   * continue shutting down others until all are shutdown. */

+  for(i = 0; i < ARRAYSIZE(ctx->baller); i++) {

+    struct eyeballer *baller = ctx->baller[i];

+    bool bdone = FALSE;

+    if(!baller || !baller->cf || baller->shutdown)

+      continue;

+    baller->result = baller->cf->cft->do_shutdown(baller->cf, data, &bdone);

+    if(baller->result || bdone)

+      baller->shutdown = TRUE; /* treat a failed shutdown as done */

+  }

+

+  *done = TRUE;

+  for(i = 0; i < ARRAYSIZE(ctx->baller); i++) {

+    if(ctx->baller[i] && !ctx->baller[i]->shutdown)

+      *done = FALSE;

+  }

+  if(*done) {

+    for(i = 0; i < ARRAYSIZE(ctx->baller); i++) {

+      if(ctx->baller[i] && ctx->baller[i]->result)

+        result = ctx->baller[i]->result;

+    }

+  }

+  CURL_TRC_CF(data, cf, "shutdown -> %d, done=%d", result, *done);

+  return result;

+}

+

 static void cf_he_adjust_pollset(struct Curl_cfilter *cf,

                                   struct Curl_easy *data,

                                   struct easy_pollset *ps)

@@ -917,7 +1001,7 @@ static CURLcode cf_he_connect(struct Curl_cfilter *cf,
                            CF_CTRL_CONN_INFO_UPDATE, 0, NULL);

 

         if(cf->conn->handler->protocol & PROTO_FAMILY_SSH)

-          Curl_pgrsTime(data, TIMER_APPCONNECT); /* we're connected already */

+          Curl_pgrsTime(data, TIMER_APPCONNECT); /* we are connected already */

         Curl_verboseconnect(data, cf->conn, cf->sockindex);

         data->info.numconnects++; /* to track the # of connections made */

       }

@@ -1052,6 +1136,7 @@ struct Curl_cftype Curl_cft_happy_eyeballs = {
   cf_he_destroy,

   cf_he_connect,

   cf_he_close,

+  cf_he_shutdown,

   Curl_cf_def_get_host,

   cf_he_adjust_pollset,

   cf_he_data_pending,

@@ -1112,7 +1197,7 @@ struct transport_provider {
 };

 

 static

-#ifndef DEBUGBUILD

+#ifndef UNITTESTS

 const

 #endif

 struct transport_provider transport_providers[] = {

@@ -1316,6 +1401,7 @@ struct Curl_cftype Curl_cft_setup = {
   cf_setup_destroy,

   cf_setup_connect,

   cf_setup_close,

+  Curl_cf_def_shutdown,

   Curl_cf_def_get_host,

   Curl_cf_def_adjust_pollset,

   Curl_cf_def_data_pending,

@@ -1378,7 +1464,7 @@ out:
   return result;

 }

 

-#ifdef DEBUGBUILD

+#ifdef UNITTESTS

 /* used by unit2600.c */

 void Curl_debug_set_transport_provider(int transport,

                                        cf_ip_connect_create *cf_create)

@@ -1391,7 +1477,7 @@ void Curl_debug_set_transport_provider(int transport,
     }

   }

 }

-#endif /* DEBUGBUILD */

+#endif /* UNITTESTS */

 

 CURLcode Curl_cf_setup_insert_after(struct Curl_cfilter *cf_at,

                                     struct Curl_easy *data,