libcurl: update to 8.0.1

4 files changed, 111 insertions, 31 deletions

diff --git a/libs/libcurl/src/vquic/curl_msh3.c b/libs/libcurl/src/vquic/curl_msh3.c
index 1b400ab5b9..94c0f829cb 100644
--- a/libs/libcurl/src/vquic/curl_msh3.c
+++ b/libs/libcurl/src/vquic/curl_msh3.c
@@ -548,7 +548,6 @@ static CURLcode cf_msh3_data_event(struct Curl_cfilter *cf,
                                    struct Curl_easy *data,

                                    int event, int arg1, void *arg2)

 {

-  struct cf_msh3_ctx *ctx = cf->ctx;

   struct HTTP *stream = data->req.p.http;

   CURLcode result = CURLE_OK;

 

@@ -579,11 +578,6 @@ static CURLcode cf_msh3_data_event(struct Curl_cfilter *cf,
     DEBUGF(LOG_CF(data, cf, "req: update info"));

     cf_msh3_active(cf, data);

     break;

-  case CF_CTRL_CONN_REPORT_STATS:

-    if(cf->sockindex == FIRSTSOCKET)

-      Curl_pgrsTimeWas(data, TIMER_APPCONNECT, ctx->handshake_at);

-    break;

-

   default:

     break;

   }

@@ -753,6 +747,19 @@ static CURLcode cf_msh3_query(struct Curl_cfilter *cf,
     *pres1 = 100;

     return CURLE_OK;

   }

+  case CF_QUERY_TIMER_CONNECT: {

+    struct curltime *when = pres2;

+    /* we do not know when the first byte arrived */

+    if(cf->connected)

+      *when = ctx->handshake_at;

+    return CURLE_OK;

+  }

+  case CF_QUERY_TIMER_APPCONNECT: {

+    struct curltime *when = pres2;

+    if(cf->connected)

+      *when = ctx->handshake_at;

+    return CURLE_OK;

+  }

   default:

     break;

   }

@@ -762,11 +769,13 @@ static CURLcode cf_msh3_query(struct Curl_cfilter *cf,
 }

 

 static bool cf_msh3_conn_is_alive(struct Curl_cfilter *cf,

-                                  struct Curl_easy *data)

+                                  struct Curl_easy *data,

+                                  bool *input_pending)

 {

   struct cf_msh3_ctx *ctx = cf->ctx;

 

   (void)data;

+  *input_pending = FALSE;

   return ctx && ctx->sock[SP_LOCAL] != CURL_SOCKET_BAD && ctx->qconn &&

          ctx->connected;

 }

diff --git a/libs/libcurl/src/vquic/curl_ngtcp2.c b/libs/libcurl/src/vquic/curl_ngtcp2.c
index f42e220783..73d2ca5e5e 100644
--- a/libs/libcurl/src/vquic/curl_ngtcp2.c
+++ b/libs/libcurl/src/vquic/curl_ngtcp2.c
@@ -64,6 +64,8 @@
 #include "vtls/vtls.h"

 #include "curl_ngtcp2.h"

 

+#include "warnless.h"

+

 /* The last 3 #include files should be in this order */

 #include "curl_printf.h"

 #include "curl_memory.h"

@@ -901,7 +903,7 @@ static int cf_ngtcp2_get_select_socks(struct Curl_cfilter *cf,
   rv |= GETSOCK_READSOCK(0);

 

   /* we're still uploading or the HTTP/2 layer wants to send data */

-  if((k->keepon & (KEEP_SEND|KEEP_SEND_PAUSE)) == KEEP_SEND &&

+  if((k->keepon & KEEP_SENDBITS) == KEEP_SEND &&

      (!stream->h3out || stream->h3out->used < H3_SEND_SIZE) &&

      ngtcp2_conn_get_cwnd_left(ctx->qconn) &&

      ngtcp2_conn_get_max_data_left(ctx->qconn) &&

@@ -951,7 +953,7 @@ static int cb_h3_stream_close(nghttp3_conn *conn, int64_t stream_id,
 }

 

 /*

- * write_resp_raw() copies resonse data in raw format to the `data`'s

+ * write_resp_raw() copies response data in raw format to the `data`'s

   * receive buffer. If not enough space is available, it appends to the

  * `data`'s overflow buffer.

  */

@@ -1762,7 +1764,7 @@ static CURLcode cf_process_ingress(struct Curl_cfilter *cf,
   ssize_t recvd;

   int rv;

   uint8_t buf[65536];

-  size_t bufsize = sizeof(buf);

+  int bufsize = (int)sizeof(buf);

   size_t pktcount = 0, total_recvd = 0;

   struct sockaddr_storage remote_addr;

   socklen_t remote_addrlen;

@@ -2107,13 +2109,6 @@ static CURLcode cf_ngtcp2_data_event(struct Curl_cfilter *cf,
       }

     }

     break;

-  case CF_CTRL_CONN_REPORT_STATS:

-    if(cf->sockindex == FIRSTSOCKET) {

-      if(ctx->got_first_byte)

-        Curl_pgrsTimeWas(data, TIMER_CONNECT, ctx->first_byte_at);

-      Curl_pgrsTimeWas(data, TIMER_APPCONNECT, ctx->handshake_at);

-    }

-    break;

   default:

     break;

   }

@@ -2127,7 +2122,6 @@ static void cf_ngtcp2_ctx_clear(struct cf_ngtcp2_ctx *ctx)
 

   if(ctx->qlogfd != -1) {

     close(ctx->qlogfd);

-    ctx->qlogfd = -1;

   }

 #ifdef USE_OPENSSL

   if(ctx->ssl)

@@ -2155,6 +2149,7 @@ static void cf_ngtcp2_ctx_clear(struct cf_ngtcp2_ctx *ctx)
     ngtcp2_conn_del(ctx->qconn);

 

   memset(ctx, 0, sizeof(*ctx));

+  ctx->qlogfd = -1;

   ctx->call_data = save;

 }

 

@@ -2176,7 +2171,7 @@ static void cf_ngtcp2_close(struct Curl_cfilter *cf, struct Curl_easy *data)
                                             (uint8_t *)buffer, sizeof(buffer),

                                             &ctx->last_error, ts);

     if(rc > 0) {

-      while((send(ctx->q.sockfd, buffer, rc, 0) == -1) &&

+      while((send(ctx->q.sockfd, buffer, (SEND_TYPE_ARG3)rc, 0) == -1) &&

             SOCKERRNO == EINTR);

     }

 

@@ -2200,6 +2195,7 @@ static void cf_ngtcp2_destroy(struct Curl_cfilter *cf, struct Curl_easy *data)
   }

   cf->ctx = NULL;

   /* No CF_DATA_RESTORE(cf, save) possible */

+  (void)save;

 }

 

 /*

@@ -2428,6 +2424,18 @@ static CURLcode cf_ngtcp2_query(struct Curl_cfilter *cf,
     else

       *pres1 = -1;

     return CURLE_OK;

+  case CF_QUERY_TIMER_CONNECT: {

+    struct curltime *when = pres2;

+    if(ctx->got_first_byte)

+      *when = ctx->first_byte_at;

+    return CURLE_OK;

+  }

+  case CF_QUERY_TIMER_APPCONNECT: {

+    struct curltime *when = pres2;

+    if(cf->connected)

+      *when = ctx->handshake_at;

+    return CURLE_OK;

+  }

   default:

     break;

   }

@@ -2436,6 +2444,32 @@ static CURLcode cf_ngtcp2_query(struct Curl_cfilter *cf,
     CURLE_UNKNOWN_OPTION;

 }

 

+static bool cf_ngtcp2_conn_is_alive(struct Curl_cfilter *cf,

+                                    struct Curl_easy *data,

+                                    bool *input_pending)

+{

+  bool alive = TRUE;

+

+  *input_pending = FALSE;

+  if(!cf->next || !cf->next->cft->is_alive(cf->next, data, input_pending))

+    return FALSE;

+

+  if(*input_pending) {

+    /* This happens before we've sent off a request and the connection is

+       not in use by any other transfer, there shouldn't be any data here,

+       only "protocol frames" */

+    *input_pending = FALSE;

+    Curl_attach_connection(data, cf->conn);

+    if(cf_process_ingress(cf, data))

+      alive = FALSE;

+    else {

+      alive = TRUE;

+    }

+    Curl_detach_connection(data);

+  }

+

+  return alive;

+}

 

 struct Curl_cftype Curl_cft_http3 = {

   "HTTP/3",

@@ -2450,7 +2484,7 @@ struct Curl_cftype Curl_cft_http3 = {
   cf_ngtcp2_send,

   cf_ngtcp2_recv,

   cf_ngtcp2_data_event,

-  Curl_cf_def_conn_is_alive,

+  cf_ngtcp2_conn_is_alive,

   Curl_cf_def_conn_keep_alive,

   cf_ngtcp2_query,

 };

@@ -2470,6 +2504,7 @@ CURLcode Curl_cf_ngtcp2_create(struct Curl_cfilter **pcf,
     result = CURLE_OUT_OF_MEMORY;

     goto out;

   }

+  ctx->qlogfd = -1;

   cf_ngtcp2_ctx_clear(ctx);

 

   result = Curl_cf_create(&cf, &Curl_cft_http3, ctx);

diff --git a/libs/libcurl/src/vquic/curl_quiche.c b/libs/libcurl/src/vquic/curl_quiche.c
index 14f48b5c07..90f98a69d1 100644
--- a/libs/libcurl/src/vquic/curl_quiche.c
+++ b/libs/libcurl/src/vquic/curl_quiche.c
@@ -444,7 +444,7 @@ static CURLcode cf_process_ingress(struct Curl_cfilter *cf,
   struct cf_quiche_ctx *ctx = cf->ctx;

   int64_t stream3_id = data->req.p.http? data->req.p.http->stream3_id : -1;

   uint8_t buf[65536];

-  size_t bufsize = sizeof(buf);

+  int bufsize = (int)sizeof(buf);

   struct sockaddr_storage remote_addr;

   socklen_t remote_addrlen;

   quiche_recv_info recv_info;

@@ -950,7 +950,7 @@ static int cf_quiche_get_select_socks(struct Curl_cfilter *cf,
   rv |= GETSOCK_READSOCK(0);

 

   /* we're still uploading or the HTTP/3 layer wants to send data */

-  if(((k->keepon & (KEEP_SEND|KEEP_SEND_PAUSE)) == KEEP_SEND)

+  if(((k->keepon & KEEP_SENDBITS) == KEEP_SEND)

      && stream_is_writeable(cf, data))

     rv |= GETSOCK_WRITESOCK(0);

 

@@ -1016,13 +1016,6 @@ static CURLcode cf_quiche_data_event(struct Curl_cfilter *cf,
   case CF_CTRL_DATA_IDLE:

     /* anything to do? */

     break;

-  case CF_CTRL_CONN_REPORT_STATS:

-    if(cf->sockindex == FIRSTSOCKET) {

-      if(ctx->got_first_byte)

-        Curl_pgrsTimeWas(data, TIMER_CONNECT, ctx->first_byte_at);

-      Curl_pgrsTimeWas(data, TIMER_APPCONNECT, ctx->handshake_at);

-    }

-    break;

   default:

     break;

   }

@@ -1346,6 +1339,18 @@ static CURLcode cf_quiche_query(struct Curl_cfilter *cf,
     else

       *pres1 = -1;

     return CURLE_OK;

+  case CF_QUERY_TIMER_CONNECT: {

+    struct curltime *when = pres2;

+    if(ctx->got_first_byte)

+      *when = ctx->first_byte_at;

+    return CURLE_OK;

+  }

+  case CF_QUERY_TIMER_APPCONNECT: {

+    struct curltime *when = pres2;

+    if(cf->connected)

+      *when = ctx->handshake_at;

+    return CURLE_OK;

+  }

   default:

     break;

   }

@@ -1354,6 +1359,32 @@ static CURLcode cf_quiche_query(struct Curl_cfilter *cf,
     CURLE_UNKNOWN_OPTION;

 }

 

+static bool cf_quiche_conn_is_alive(struct Curl_cfilter *cf,

+                                    struct Curl_easy *data,

+                                    bool *input_pending)

+{

+  bool alive = TRUE;

+

+  *input_pending = FALSE;

+  if(!cf->next || !cf->next->cft->is_alive(cf->next, data, input_pending))

+    return FALSE;

+

+  if(*input_pending) {

+    /* This happens before we've sent off a request and the connection is

+       not in use by any other transfer, there shouldn't be any data here,

+       only "protocol frames" */

+    *input_pending = FALSE;

+    Curl_attach_connection(data, cf->conn);

+    if(cf_process_ingress(cf, data))

+      alive = FALSE;

+    else {

+      alive = TRUE;

+    }

+    Curl_detach_connection(data);

+  }

+

+  return alive;

+}

 

 struct Curl_cftype Curl_cft_http3 = {

   "HTTP/3",

@@ -1368,7 +1399,7 @@ struct Curl_cftype Curl_cft_http3 = {
   cf_quiche_send,

   cf_quiche_recv,

   cf_quiche_data_event,

-  Curl_cf_def_conn_is_alive,

+  cf_quiche_conn_is_alive,

   Curl_cf_def_conn_keep_alive,

   cf_quiche_query,

 };

diff --git a/libs/libcurl/src/vquic/vquic.c b/libs/libcurl/src/vquic/vquic.c
index ae5dc09e60..be9e151669 100644
--- a/libs/libcurl/src/vquic/vquic.c
+++ b/libs/libcurl/src/vquic/vquic.c
@@ -167,7 +167,8 @@ static CURLcode do_sendmsg(struct Curl_cfilter *cf,
 

   *psent = 0;

 

-  while((sent = send(qctx->sockfd, (const char *)pkt, pktlen, 0)) == -1 &&

+  while((sent = send(qctx->sockfd,

+                     (const char *)pkt, (SEND_TYPE_ARG3)pktlen, 0)) == -1 &&

         SOCKERRNO == EINTR)

     ;

 

@@ -363,6 +364,10 @@ bool Curl_conn_is_http3(const struct Curl_easy *data,
 CURLcode Curl_conn_may_http3(struct Curl_easy *data,

                              const struct connectdata *conn)

 {

+  if(conn->transport == TRNSPRT_UNIX) {

+    /* cannot do QUIC over a unix domain socket */

+    return CURLE_QUIC_CONNECT_ERROR;

+  }

   if(!(conn->handler->flags & PROTOPT_SSL)) {

     failf(data, "HTTP/3 requested for non-HTTPS URL");

     return CURLE_URL_MALFORMAT;