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

[Dave Reisner]

    Date: Saturday, March 7, 2020 @ 21:53:35
  Author: dreisner
Revision: 376904

upgpkg: curl 7.69.0-3

16:47           demize  {U+00BB} dreisner: 22:42:17 <dbermond> kpcyrd: regarding the curl problem, commit 8aa04e9 *reopens* issue #4966. upstream curl fixed this through commit e040146, so this commit is also needed I think. 
16:47           demize  {U+00BB} https://github.com/curl/curl/issues/4966
16:47           demize  {U+00BB} https://github.com/curl/curl/commit/e040146f22608fd92c44be2447a6505141a8a867
16:47            phrik  {U+00BB} Title: HTTPS transfer stalled when using pause/continue {U+00B7} Issue #4966 {U+00B7} curl/curl {U+00B7} GitHub (at github.com)
16:47            phrik  {U+00BB} Title: pause: force a connection (re-)check after unpausing {U+00B7} curl/curl at e040146 {U+00B7} GitHub (at github.com)
16:48           demize  {U+00BB} Annoying.

Added:
  curl/trunk/0001-pause-force-a-connection-re-check-after-unpausing.patch
Modified:
  curl/trunk/PKGBUILD

--------------------------------------------------------------+
 0001-pause-force-a-connection-re-check-after-unpausing.patch |   33 ++++++++++
 PKGBUILD                                                     |    9 +-
 2 files changed, 39 insertions(+), 3 deletions(-)

Added: 0001-pause-force-a-connection-re-check-after-unpausing.patch
===================================================================
--- 0001-pause-force-a-connection-re-check-after-unpausing.patch	                        (rev 0)
+++ 0001-pause-force-a-connection-re-check-after-unpausing.patch	2020-03-07 21:53:35 UTC (rev 376904)
@@ -0,0 +1,33 @@
+From e040146f22608fd92c44be2447a6505141a8a867 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Fri, 6 Mar 2020 10:04:28 +0100
+Subject: [PATCH] pause: force a connection (re-)check after unpausing
+
+There might be data available that was already read off the socket, for
+example in the TLS layer.
+
+Reported-by: Anders Berg
+Fixes #4966
+Closes #5049
+---
+ lib/easy.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/easy.c b/lib/easy.c
+index 33bc1aab7..f7a6d5c60 100644
+--- a/lib/easy.c
++++ b/lib/easy.c
+@@ -1047,6 +1047,10 @@ CURLcode curl_easy_pause(struct Curl_easy *data, int action)
+   if((newstate & (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) !=
+      (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) {
+     Curl_expire(data, 0, EXPIRE_RUN_NOW); /* get this handle going again */
++
++    /* force a recv/send check of this connection, as the data might've been
++       read off the socket already */
++    data->conn->cselect_bits = CURL_CSELECT_IN | CURL_CSELECT_OUT;
+     if(data->multi)
+       Curl_update_timer(data->multi);
+   }
+-- 
+2.25.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-07 21:01:27 UTC (rev 376903)
+++ PKGBUILD	2020-03-07 21:53:35 UTC (rev 376904)
@@ -6,7 +6,7 @@
 
 pkgname=curl
 pkgver=7.69.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An URL retrieval utility and library"
 arch=('x86_64')
 url="https://curl.haxx.se"
@@ -15,10 +15,12 @@
          'libidn2' 'libidn2.so')
 provides=('libcurl.so')
 source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        0001-Revert-pause-force-drain-the-transfer-on-unpause.patch)
+        0001-Revert-pause-force-drain-the-transfer-on-unpause.patch
+        0001-pause-force-a-connection-re-check-after-unpausing.patch)
 sha512sums=('0ecd9e6e55cb19400fafdcd723c72667903ec760652e60fe0b884a672e1ac5d8667c8837422145a9af995ffe36d31a2685296f272ebddf1f5f1a7b12baf0fbad'
             'SKIP'
-            '6aaafcb580f88c715a294ea7b53877a405a4f6c4a338d830380a5c97a324268a287c893ee6fd24c3b69dc0566275336ec74c3816f2202e12d39840360d6784f0')
+            '6aaafcb580f88c715a294ea7b53877a405a4f6c4a338d830380a5c97a324268a287c893ee6fd24c3b69dc0566275336ec74c3816f2202e12d39840360d6784f0'
+            'bc384dcfef4f6ca8d52171b97d5979c5b043e70d756836f87449ea0108d9615521408fa71c330c4b627738978eacd24de80a0e93438532a8f48a4d049e83334e')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
 
 prepare() {
@@ -25,6 +27,7 @@
   cd "$pkgname-$pkgver"
 
   patch -Np1 <../0001-Revert-pause-force-drain-the-transfer-on-unpause.patch
+  patch -Np1 <../0001-pause-force-a-connection-re-check-after-unpausing.patch
 }
 
 build() {