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

[Dave Reisner]

    Date: Saturday, March 7, 2020 @ 20:27:02
  Author: dreisner
Revision: 376899

upgpkg: curl 7.69.0-2

14:42           demize  {U+00BB} dreisner: Could you backport https://github.com/curl/curl/commit/8aa04e9a24932b830bc5eaf6838dea5a3329341e?
14:42            phrik  {U+00BB} Title: Revert "pause: force-drain the transfer on unpause" {U+00B7} curl/curl at 8aa04e9 {U+00B7} GitHub (at github.com)
14:42           demize  {U+00BB} dreisner: Fixes a regression in 7.69: https://github.com/curl/curl/issues/5044
14:42            phrik  {U+00BB} Title: Some HTTP2 requests are timing out since 7.69.0 {U+00B7} Issue #5044 {U+00B7} curl/curl {U+00B7} GitHub (at github.com)
14:42           demize  {U+00BB} Which causes e.g. cargo to be completely bork.

Added:
  curl/trunk/0001-Revert-pause-force-drain-the-transfer-on-unpause.patch
Modified:
  curl/trunk/PKGBUILD

-------------------------------------------------------------+
 0001-Revert-pause-force-drain-the-transfer-on-unpause.patch |   55 ++++++++++
 PKGBUILD                                                    |   14 ++
 2 files changed, 66 insertions(+), 3 deletions(-)

Added: 0001-Revert-pause-force-drain-the-transfer-on-unpause.patch
===================================================================
--- 0001-Revert-pause-force-drain-the-transfer-on-unpause.patch	                        (rev 0)
+++ 0001-Revert-pause-force-drain-the-transfer-on-unpause.patch	2020-03-07 20:27:02 UTC (rev 376899)
@@ -0,0 +1,55 @@
+From 8aa04e9a24932b830bc5eaf6838dea5a3329341e Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Thu, 5 Mar 2020 23:45:36 +0100
+Subject: [PATCH] Revert "pause: force-drain the transfer on unpause"
+
+This reverts commit fa0216b294af4c7113a9040ca65eefc7fc18ac1c (from #5000)
+
+Clearly that didn't solve the problem correctly.
+
+Reported-by: Christopher Reid
+Reopens #4966
+Fixes #5044
+---
+ lib/easy.c     | 1 -
+ lib/transfer.c | 5 ++---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/lib/easy.c b/lib/easy.c
+index 1a6912748..454621076 100644
+--- a/lib/easy.c
++++ b/lib/easy.c
+@@ -1033,7 +1033,6 @@ CURLcode curl_easy_pause(struct Curl_easy *data, int action)
+      to have this handle checked soon */
+   if((newstate & (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) !=
+      (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) {
+-    data->state.drain++;
+     Curl_expire(data, 0, EXPIRE_RUN_NOW); /* get this handle going again */
+     if(data->multi)
+       Curl_update_timer(data->multi);
+diff --git a/lib/transfer.c b/lib/transfer.c
+index 827076183..ead8b36db 100644
+--- a/lib/transfer.c
++++ b/lib/transfer.c
+@@ -5,7 +5,7 @@
+  *                            | (__| |_| |  _ <| |___
+  *                             \___|\___/|_| \_\_____|
+  *
+- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel at haxx.se>, et al.
++ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel at haxx.se>, et al.
+  *
+  * This software is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution. The terms
+@@ -1217,8 +1217,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
+   else
+     fd_write = CURL_SOCKET_BAD;
+ 
+-  if(data->state.drain) {
+-    data->state.drain--;
++  if(conn->data->state.drain) {
+     select_res |= CURL_CSELECT_IN;
+     DEBUGF(infof(data, "Curl_readwrite: forcibly told to drain data\n"));
+   }
+-- 
+2.25.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-07 18:44:58 UTC (rev 376898)
+++ PKGBUILD	2020-03-07 20:27:02 UTC (rev 376899)
@@ -6,7 +6,7 @@
 
 pkgname=curl
 pkgver=7.69.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-Revert-pause-force-drain-the-transfer-on-unpause.patch)
 sha512sums=('0ecd9e6e55cb19400fafdcd723c72667903ec760652e60fe0b884a672e1ac5d8667c8837422145a9af995ffe36d31a2685296f272ebddf1f5f1a7b12baf0fbad'
-            'SKIP')
+            'SKIP'
+            '6aaafcb580f88c715a294ea7b53877a405a4f6c4a338d830380a5c97a324268a287c893ee6fd24c3b69dc0566275336ec74c3816f2202e12d39840360d6784f0')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <../0001-Revert-pause-force-drain-the-transfer-on-unpause.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"