[arch-commits] Commit in curl/trunk (2 files)

[Christian Hesse]

    Date: Saturday, November 9, 2019 @ 21:36:21
  Author: eworm
Revision: 367297

upgpkg: curl 7.67.0-2

For now revert the commit that makes mpd crash... (FS#64414)

Added:
  curl/trunk/0001-http2-expire-a-timeout-at-end-of-stream.patch
Modified:
  curl/trunk/PKGBUILD

----------------------------------------------------+
 0001-http2-expire-a-timeout-at-end-of-stream.patch |   26 +++++++++++++++++++
 PKGBUILD                                           |   14 ++++++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

Added: 0001-http2-expire-a-timeout-at-end-of-stream.patch
===================================================================
--- 0001-http2-expire-a-timeout-at-end-of-stream.patch	                        (rev 0)
+++ 0001-http2-expire-a-timeout-at-end-of-stream.patch	2019-11-09 21:36:21 UTC (rev 367297)
@@ -0,0 +1,26 @@
+From 59041f052a5209a3aebb146c01b689424f9f7b04 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Thu, 17 Oct 2019 14:25:45 +0200
+Subject: http2: expire a timeout at end of stream
+
+To make sure that transfer is being dealt with. Streams without
+Content-Length need a final read to notice the end-of-stream state.
+
+Reported-by: Tom van der Woerdt
+Fixes #4496
+---
+ lib/http2.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/http2.c b/lib/http2.c
+index b5b831b56..c0f29f83e 100644
+--- a/lib/http2.c
++++ b/lib/http2.c
+@@ -848,6 +848,7 @@ static int on_stream_close(nghttp2_session *session, int32_t stream_id,
+     stream->closed = TRUE;
+     httpc = &conn->proto.httpc;
+     drain_this(data_s, httpc);
++    Curl_expire(data_s, 0, EXPIRE_RUN_NOW);
+     httpc->error_code = error_code;
+ 
+     /* remove the entry from the hash as the stream is now gone */

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-09 17:51:12 UTC (rev 367296)
+++ PKGBUILD	2019-11-09 21:36:21 UTC (rev 367297)
@@ -6,7 +6,7 @@
 
 pkgname=curl
 pkgver=7.67.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An URL retrieval utility and library"
 arch=('x86_64')
 url="https://curl.haxx.se"
@@ -14,11 +14,19 @@
 depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl' 'libnghttp2'
          'libidn2' 'libidn2.so')
 provides=('libcurl.so')
-source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc})
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+        '0001-http2-expire-a-timeout-at-end-of-stream.patch')
 sha512sums=('73365f964df733b5e79d690ba7260a279986a9637ba0026b37cca2eca7ba8e37967251751bdf26de730f6f432713da8b7e0a315e84f1e9dad0e0bfd3d7882f92'
-            'SKIP')
+            'SKIP'
+            'b21d53e8b6af37f1ae9deb4ac6dea50a13816f48932d47a1a167664988c0c2db472528d6c6790a782bca765e4edfad84f1452d0af8679d2c66f543e8ec7132ce')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 -R < ../0001-http2-expire-a-timeout-at-end-of-stream.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"