Date: Saturday, March 7, 2020 @ 20:27:18 Author: dreisner Revision: 376900
archrelease: copy trunk to testing-x86_64 Added: curl/repos/testing-x86_64/ curl/repos/testing-x86_64/0001-Revert-pause-force-drain-the-transfer-on-unpause.patch (from rev 376899, curl/trunk/0001-Revert-pause-force-drain-the-transfer-on-unpause.patch) curl/repos/testing-x86_64/PKGBUILD (from rev 376899, curl/trunk/PKGBUILD) -------------------------------------------------------------+ 0001-Revert-pause-force-drain-the-transfer-on-unpause.patch | 55 +++++++++ PKGBUILD | 58 ++++++++++ 2 files changed, 113 insertions(+) Copied: curl/repos/testing-x86_64/0001-Revert-pause-force-drain-the-transfer-on-unpause.patch (from rev 376899, curl/trunk/0001-Revert-pause-force-drain-the-transfer-on-unpause.patch) =================================================================== --- testing-x86_64/0001-Revert-pause-force-drain-the-transfer-on-unpause.patch (rev 0) +++ testing-x86_64/0001-Revert-pause-force-drain-the-transfer-on-unpause.patch 2020-03-07 20:27:18 UTC (rev 376900) @@ -0,0 +1,55 @@ +From 8aa04e9a24932b830bc5eaf6838dea5a3329341e Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <dan...@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, <dan...@haxx.se>, et al. ++ * Copyright (C) 1998 - 2019, Daniel Stenberg, <dan...@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 + Copied: curl/repos/testing-x86_64/PKGBUILD (from rev 376899, curl/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2020-03-07 20:27:18 UTC (rev 376900) @@ -0,0 +1,58 @@ +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Eric Belanger <e...@archlinux.org> +# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> + +pkgname=curl +pkgver=7.69.0 +pkgrel=2 +pkgdesc="An URL retrieval utility and library" +arch=('x86_64') +url="https://curl.haxx.se" +license=('MIT') +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} + 0001-Revert-pause-force-drain-the-transfer-on-unpause.patch) +sha512sums=('0ecd9e6e55cb19400fafdcd723c72667903ec760652e60fe0b884a672e1ac5d8667c8837422145a9af995ffe36d31a2685296f272ebddf1f5f1a7b12baf0fbad' + '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" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-ldap \ + --disable-ldaps \ + --disable-manual \ + --enable-ipv6 \ + --enable-versioned-symbols \ + --enable-threaded-resolver \ + --with-gssapi \ + --with-libssh2 \ + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install -C scripts + + # license + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING +}