Update curl to v8.7.1

Author: donny-dont

README.md

@@ -56,7 +56,7 @@ the requirements.
 | [nghttp3](https://github.com/ngtcp2/nghttp3) | 1.2.0 | 2024-02-16 |
 | [ngtcp2](https://github.com/ngtcp2/ngtcp2) | 1.4.0 | 2024-03-18 |
 | [c-ares](https://c-ares.org) | 1.28.1 | 2024-03-30 |
-| [curl](https://curl.se) | 8.6.0 | 2024-01-30 |
+| [curl](https://curl.se) | 8.7.1 | 2024-03-27 |
 | [libxml2](http://xmlsoft.org) | 2.12.6 | 2024-03-15 |
 | [libxslt](http://xmlsoft.org/libxslt) | 1.1.39 | 2023-11-16 |
 | [lcms](https://www.littlecms.com/) | 2.16.0 | 2023-12-03 |

ports/curl/patches/0002-content_encoding-brotli-and-others-pass-through-0-le.patch

@@ -0,0 +1,74 @@
+From 589ecdc0783ef8877ae5210e41f29a2be65992e7 Mon Sep 17 00:00:00 2001
+From: Stefan Eissing <stefan@eissing.org>
+Date: Thu, 28 Mar 2024 11:08:15 +0100
+Subject: [PATCH] content_encoding: brotli and others, pass through 0-length
+ writes
+
+- curl's transfer handling may write 0-length chunks at the end of the
+  download with an EOS flag. (HTTP/2 does this commonly)
+
+- content encoders need to pass-through such a write and not count this
+  as error in case they are finished decoding
+
+Fixes #13209
+Fixes #13212
+Closes #13219
+---
+ lib/content_encoding.c         | 10 +++++-----
+ tests/http/test_02_download.py | 13 +++++++++++++
+ tests/http/testenv/env.py      |  7 ++++++-
+ tests/http/testenv/httpd.py    | 20 ++++++++++++++++++++
+ 4 files changed, 44 insertions(+), 6 deletions(-)
+
+diff --git a/lib/content_encoding.c b/lib/content_encoding.c
+index c1abf24e8..8e926dd2e 100644
+--- a/lib/content_encoding.c
++++ b/lib/content_encoding.c
+@@ -300,7 +300,7 @@ static CURLcode deflate_do_write(struct Curl_easy *data,
+   struct zlib_writer *zp = (struct zlib_writer *) writer;
+   z_stream *z = &zp->z;     /* zlib state structure */
+ 
+-  if(!(type & CLIENTWRITE_BODY))
++  if(!(type & CLIENTWRITE_BODY) || !nbytes)
+     return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
+ 
+   /* Set the compressed input when this function is called */
+@@ -457,7 +457,7 @@ static CURLcode gzip_do_write(struct Curl_easy *data,
+   struct zlib_writer *zp = (struct zlib_writer *) writer;
+   z_stream *z = &zp->z;     /* zlib state structure */
+ 
+-  if(!(type & CLIENTWRITE_BODY))
++  if(!(type & CLIENTWRITE_BODY) || !nbytes)
+     return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
+ 
+   if(zp->zlib_init == ZLIB_INIT_GZIP) {
+@@ -669,7 +669,7 @@ static CURLcode brotli_do_write(struct Curl_easy *data,
+   CURLcode result = CURLE_OK;
+   BrotliDecoderResult r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT;
+ 
+-  if(!(type & CLIENTWRITE_BODY))
++  if(!(type & CLIENTWRITE_BODY) || !nbytes)
+     return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
+ 
+   if(!bp->br)
+@@ -762,7 +762,7 @@ static CURLcode zstd_do_write(struct Curl_easy *data,
+   ZSTD_outBuffer out;
+   size_t errorCode;
+ 
+-  if(!(type & CLIENTWRITE_BODY))
++  if(!(type & CLIENTWRITE_BODY) || !nbytes)
+     return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
+ 
+   if(!zp->decomp) {
+@@ -916,7 +916,7 @@ static CURLcode error_do_write(struct Curl_easy *data,
+   (void) buf;
+   (void) nbytes;
+ 
+-  if(!(type & CLIENTWRITE_BODY))
++  if(!(type & CLIENTWRITE_BODY) || !nbytes)
+     return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
+ 
+   failf(data, "Unrecognized content encoding type. "
+-- 
+2.44.0.windows.1
+

ports/curl/portfile.cmake

@@ -1,16 +1,18 @@
-set(VERSION 8.6.0)
+set(VERSION 8.7.1)
 string(REPLACE "." "_" TAG ${VERSION})
 
 # Get archive
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/curl/curl/releases/download/curl-${TAG}/curl-${VERSION}.zip"
     FILENAME "curl-${VERSION}.zip"
-    SHA512 f5f4b966b3bd379617d2f6d62513fa674f302c817c58903284f8aaeac6f1f1d62970def0b78d7f13341b6862b95e3ad6055d2dc62563eba22911981e17daa9cc
+    SHA512 640bf8cf7ab68470d1a15c2a85c32849f7f2de85e4d4b1e403c7ee3c849a9ac797640ff0e4e3f9a24cf2aed449e0dc46934a7b32326f5381b3216acc3589a063
 )
 
 # Patches
 set(PATCHES
     ${CMAKE_CURRENT_LIST_DIR}/patches/0001-Adjust-CMake-for-vcpkg.patch
+    # Remove in next release
+    ${CMAKE_CURRENT_LIST_DIR}/patches/0002-content_encoding-brotli-and-others-pass-through-0-le.patch
 )
 
 # Extract archive

ports/curl/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "curl",
-  "version": "8.6.0",
+  "version": "8.7.1",
   "description": "A library for transferring data with URLs",
   "homepage": "https://curl.se/",
   "dependencies": [