libcurl: update to 8.13.0

1 files changed, 23 insertions, 22 deletions

diff --git a/libs/libcurl/src/connect.c b/libs/libcurl/src/connect.c
index 4c29377783..c909d6b544 100644
--- a/libs/libcurl/src/connect.c
+++ b/libs/libcurl/src/connect.c
@@ -87,7 +87,7 @@
 

 #if !defined(CURL_DISABLE_ALTSVC) || defined(USE_HTTPSRR)

 

-enum alpnid Curl_alpn2alpnid(char *name, size_t len)

+enum alpnid Curl_alpn2alpnid(const char *name, size_t len)

 {

   if(len == 2) {

     if(strncasecompare(name, "h1", 2))

@@ -161,7 +161,7 @@ timediff_t Curl_timeleft(struct Curl_easy *data,
 }

 

 void Curl_shutdown_start(struct Curl_easy *data, int sockindex,

-                         struct curltime *nowp)

+                         int timeout_ms, struct curltime *nowp)

 {

   struct curltime now;

 

@@ -171,8 +171,13 @@ void Curl_shutdown_start(struct Curl_easy *data, int sockindex,
     nowp = &now;

   }

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

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

-    data->set.shutdowntimeout : DEFAULT_SHUTDOWN_TIMEOUT_MS;

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

+    (unsigned int)timeout_ms :

+    ((data->set.shutdowntimeout > 0) ?

+     data->set.shutdowntimeout : DEFAULT_SHUTDOWN_TIMEOUT_MS);

+  if(data->conn->shutdown.timeout_ms)

+    Curl_expire_ex(data, nowp, data->conn->shutdown.timeout_ms,

+                   EXPIRE_SHUTDOWN);

 }

 

 timediff_t Curl_shutdown_timeleft(struct connectdata *conn, int sockindex,

@@ -249,7 +254,7 @@ addr_next_match(const struct Curl_addrinfo *addr, int family)
 }

 

 /* retrieves ip address and port from a sockaddr structure.

-   note it calls Curl_inet_ntop which sets errno on fail, not SOCKERRNO. */

+   note it calls curlx_inet_ntop which sets errno on fail, not SOCKERRNO. */

 bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,

                       char *addr, int *port)

 {

@@ -266,8 +271,8 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
   switch(sa->sa_family) {

     case AF_INET:

       si = (struct sockaddr_in *)(void *) sa;

-      if(Curl_inet_ntop(sa->sa_family, &si->sin_addr,

-                        addr, MAX_IPADR_LEN)) {

+      if(curlx_inet_ntop(sa->sa_family, &si->sin_addr,

+                         addr, MAX_IPADR_LEN)) {

         unsigned short us_port = ntohs(si->sin_port);

         *port = us_port;

         return TRUE;

@@ -276,8 +281,8 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
 #ifdef USE_IPV6

     case AF_INET6:

       si6 = (struct sockaddr_in6 *)(void *) sa;

-      if(Curl_inet_ntop(sa->sa_family, &si6->sin6_addr,

-                        addr, MAX_IPADR_LEN)) {

+      if(curlx_inet_ntop(sa->sa_family, &si6->sin6_addr,

+                         addr, MAX_IPADR_LEN)) {

         unsigned short us_port = ntohs(si6->sin6_port);

         *port = us_port;

         return TRUE;

@@ -301,7 +306,7 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
 

   addr[0] = '\0';

   *port = 0;

-  errno = EAFNOSUPPORT;

+  CURL_SETERRNO(SOCKEAFNOSUPPORT);

   return FALSE;

 }

 

@@ -593,7 +598,7 @@ static CURLcode baller_connect(struct Curl_cfilter *cf,
   *connected = baller->connected;

   if(!baller->result &&  !*connected) {

     /* evaluate again */

-    baller->result = Curl_conn_cf_connect(baller->cf, data, 0, connected);

+    baller->result = Curl_conn_cf_connect(baller->cf, data, connected);

 

     if(!baller->result) {

       if(*connected) {

@@ -603,8 +608,8 @@ static CURLcode baller_connect(struct Curl_cfilter *cf,
       else if(Curl_timediff(*now, baller->started) >= baller->timeoutms) {

         infof(data, "%s connect timeout after %" FMT_TIMEDIFF_T

               "ms, move on!", baller->name, baller->timeoutms);

-#if defined(ETIMEDOUT)

-        baller->error = ETIMEDOUT;

+#ifdef SOCKETIMEDOUT

+        baller->error = SOCKETIMEDOUT;

 #endif

         baller->result = CURLE_OPERATION_TIMEDOUT;

       }

@@ -765,11 +770,8 @@ evaluate:
         Curl_timediff(now, data->progress.t_startsingle),

         curl_easy_strerror(result));

 

-#ifdef WSAETIMEDOUT

-  if(WSAETIMEDOUT == data->state.os_errno)

-    result = CURLE_OPERATION_TIMEDOUT;

-#elif defined(ETIMEDOUT)

-  if(ETIMEDOUT == data->state.os_errno)

+#ifdef SOCKETIMEDOUT

+  if(SOCKETIMEDOUT == data->state.os_errno)

     result = CURLE_OPERATION_TIMEDOUT;

 #endif

 

@@ -948,7 +950,7 @@ static void cf_he_adjust_pollset(struct Curl_cfilter *cf,
 

 static CURLcode cf_he_connect(struct Curl_cfilter *cf,

                               struct Curl_easy *data,

-                              bool blocking, bool *done)

+                              bool *done)

 {

   struct cf_he_ctx *ctx = cf->ctx;

   CURLcode result = CURLE_OK;

@@ -958,7 +960,6 @@ static CURLcode cf_he_connect(struct Curl_cfilter *cf,
     return CURLE_OK;

   }

 

-  (void)blocking;

   DEBUGASSERT(ctx);

   *done = FALSE;

 

@@ -1263,7 +1264,7 @@ struct cf_setup_ctx {
 

 static CURLcode cf_setup_connect(struct Curl_cfilter *cf,

                                  struct Curl_easy *data,

-                                 bool blocking, bool *done)

+                                 bool *done)

 {

   struct cf_setup_ctx *ctx = cf->ctx;

   CURLcode result = CURLE_OK;

@@ -1276,7 +1277,7 @@ static CURLcode cf_setup_connect(struct Curl_cfilter *cf,
   /* connect current sub-chain */

 connect_sub_chain:

   if(cf->next && !cf->next->connected) {

-    result = Curl_conn_cf_connect(cf->next, data, blocking, done);

+    result = Curl_conn_cf_connect(cf->next, data, done);

     if(result || !*done)

       return result;

   }