libcurl: update to 8.9.0

1 files changed, 11 insertions, 10 deletions

diff --git a/libs/libcurl/src/c-hyper.c b/libs/libcurl/src/c-hyper.c
index d2523718f4..9780019f66 100644
--- a/libs/libcurl/src/c-hyper.c
+++ b/libs/libcurl/src/c-hyper.c
@@ -206,7 +206,7 @@ static int hyper_body_chunk(void *userdata, const hyper_buf *chunk)
   struct SingleRequest *k = &data->req;

   CURLcode result = CURLE_OK;

 

-  if(0 == k->bodywrites) {

+  if(!k->bodywritten) {

 #if defined(USE_NTLM)

     struct connectdata *conn = data->conn;

     if(conn->bits.close &&

@@ -324,7 +324,7 @@ static CURLcode empty_header(struct Curl_easy *data)
     result = hyper_each_header(data, NULL, 0, NULL, 0) ?

       CURLE_WRITE_ERROR : CURLE_OK;

     if(result)

-      failf(data, "hyperstream: couldn't pass blank header");

+      failf(data, "hyperstream: could not pass blank header");

     /* Hyper does chunked decoding itself. If it was added during

      * response header processing, remove it again. */

     Curl_cwriter_remove_by_name(data, "chunked");

@@ -420,8 +420,8 @@ CURLcode Curl_hyper_stream(struct Curl_easy *data,
         /* end of transfer */

         data->req.done = TRUE;

         infof(data, "hyperstream is done");

-        if(!k->bodywrites) {

-          /* hyper doesn't always call the body write callback */

+        if(!k->bodywritten) {

+          /* hyper does not always call the body write callback */

           result = Curl_http_firstwrite(data);

         }

         break;

@@ -439,7 +439,7 @@ CURLcode Curl_hyper_stream(struct Curl_easy *data,
 

     *didwhat = KEEP_RECV;

     if(!resp) {

-      failf(data, "hyperstream: couldn't get response");

+      failf(data, "hyperstream: could not get response");

       return CURLE_RECV_ERROR;

     }

 

@@ -462,7 +462,7 @@ CURLcode Curl_hyper_stream(struct Curl_easy *data,
 

     headers = hyper_response_headers(resp);

     if(!headers) {

-      failf(data, "hyperstream: couldn't get response headers");

+      failf(data, "hyperstream: could not get response headers");

       result = CURLE_RECV_ERROR;

       break;

     }

@@ -505,7 +505,7 @@ CURLcode Curl_hyper_stream(struct Curl_easy *data,
 

     resp_body = hyper_response_body(resp);

     if(!resp_body) {

-      failf(data, "hyperstream: couldn't get response body");

+      failf(data, "hyperstream: could not get response body");

       result = CURLE_RECV_ERROR;

       break;

     }

@@ -669,7 +669,7 @@ static int uploadstreamed(void *userdata, hyper_context *ctx,
       goto out;

     }

     /* increasing the writebytecount here is a little premature but we

-       don't know exactly when the body is sent */

+       do not know exactly when the body is sent */

     data->req.writebytecount += fillcount;

     Curl_pgrsSetUploadCounter(data, data->req.writebytecount);

     rc = HYPER_POLL_READY;

@@ -772,7 +772,7 @@ static void http1xx_cb(void *arg, struct hyper_response *resp)
   if(!result) {

     headers = hyper_response_headers(resp);

     if(!headers) {

-      failf(data, "hyperstream: couldn't get 1xx response headers");

+      failf(data, "hyperstream: could not get 1xx response headers");

       result = CURLE_RECV_ERROR;

     }

   }

@@ -1133,7 +1133,7 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done)
     Curl_pgrsSetUploadSize(data, 0); /* nothing */

   }

 

-  Curl_xfer_setup(data, FIRSTSOCKET, -1, TRUE, FIRSTSOCKET);

+  Curl_xfer_setup1(data, CURL_XFER_SENDRECV, -1, TRUE);

   conn->datastream = Curl_hyper_stream;

 

   /* clear userpwd and proxyuserpwd to avoid reusing old credentials

@@ -1206,6 +1206,7 @@ static const struct Curl_crtype cr_hyper_protocol = {
   Curl_creader_def_resume_from,

   Curl_creader_def_rewind,

   cr_hyper_unpause,

+  Curl_creader_def_is_paused,

   Curl_creader_def_done,

   sizeof(struct Curl_creader)

 };