libcurl: update to 8.4.0

1 files changed, 6 insertions, 10 deletions

diff --git a/libs/libcurl/src/c-hyper.c b/libs/libcurl/src/c-hyper.c
index 6f3eb794f7..74adf4e44b 100644
--- a/libs/libcurl/src/c-hyper.c
+++ b/libs/libcurl/src/c-hyper.c
@@ -174,8 +174,6 @@ static int hyper_each_header(void *userdata,
 

   if(!data->state.hconnect || !data->set.suppress_connect_headers) {

     writetype = CLIENTWRITE_HEADER;

-    if(data->set.include_header)

-      writetype |= CLIENTWRITE_BODY;

     if(data->state.hconnect)

       writetype |= CLIENTWRITE_CONNECT;

     if(data->req.httpcode/100 == 1)

@@ -248,11 +246,7 @@ static int hyper_body_chunk(void *userdata, const hyper_buf *chunk)
   if(0 == len)

     return HYPER_ITER_CONTINUE;

   Curl_debug(data, CURLINFO_DATA_IN, buf, len);

-  if(!data->set.http_ce_skip && k->writer_stack)

-    /* content-encoded data */

-    result = Curl_unencode_write(data, k->writer_stack, buf, len);

-  else

-    result = Curl_client_write(data, CLIENTWRITE_BODY, buf, len);

+  result = Curl_client_write(data, CLIENTWRITE_BODY, buf, len);

 

   if(result) {

     data->state.hresult = result;

@@ -260,7 +254,11 @@ static int hyper_body_chunk(void *userdata, const hyper_buf *chunk)
   }

 

   data->req.bytecount += len;

-  Curl_pgrsSetDownloadCounter(data, data->req.bytecount);

+  result = Curl_pgrsSetDownloadCounter(data, data->req.bytecount);

+  if(result) {

+    data->state.hresult = result;

+    return HYPER_ITER_BREAK;

+  }

   return HYPER_ITER_CONTINUE;

 }

 

@@ -314,8 +312,6 @@ static CURLcode status_line(struct Curl_easy *data,
 

   if(!data->state.hconnect || !data->set.suppress_connect_headers) {

     writetype = CLIENTWRITE_HEADER|CLIENTWRITE_STATUS;

-    if(data->set.include_header)

-      writetype |= CLIENTWRITE_BODY;

     result = Curl_client_write(data, writetype,

                                Curl_dyn_ptr(&data->state.headerb), len);

     if(result)