commit: eab9b3a5a0d1b324b65268e74a4acdfceec0d32a Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Thu Sep 26 16:51:57 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 4 08:26:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eab9b3a5
net-misc/curl: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Sam James <sam <AT> gentoo.org> .../curl/files/curl-8.10.0-sendrecv-poll.patch | 51 ---------------------- 1 file changed, 51 deletions(-) diff --git a/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch b/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch deleted file mode 100644 index 44654377008a..000000000000 --- a/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://github.com/curl/curl/commit/a33bcc9b53b9d6ea9f879624e8abea0b012b008e -From: Stefan Eissing <[email protected]> -Date: Fri, 13 Sep 2024 18:36:53 +0200 -Subject: [PATCH] transfer: fix sendrecv() without interim poll - -There was a "clever" optimization that skipped sendrecv() handling when -the transfer's pollset was empty. This happens for paused transfers, for -example. - -Unforunately, if the libcurl application never calls curl_multi_poll(), -the pollset is and will aways remain empty, prevent the transfer from -progressing. - -Remove this "optimization" and always try send/receive where applicable. - -Fixes #14898 -Reported-by: Victor Kislov -Closes #14901 ---- a/lib/transfer.c -+++ b/lib/transfer.c -@@ -431,8 +431,6 @@ CURLcode Curl_sendrecv(struct Curl_easy *data, struct curltime *nowp) - if(select_bits_paused(data, data->state.select_bits)) { - /* leave the bits unchanged, so they'll tell us what to do when - * this transfer gets unpaused. */ -- /* DEBUGF(infof(data, "sendrecv, select_bits, early return on PAUSED")); -- */ - result = CURLE_OK; - goto out; - } -@@ -440,16 +438,13 @@ CURLcode Curl_sendrecv(struct Curl_easy *data, struct curltime *nowp) - /* DEBUGF(infof(data, "sendrecv, select_bits %x, RUN", select_bits)); */ - select_bits = (CURL_CSELECT_OUT|CURL_CSELECT_IN); - } -- else if(data->last_poll.num) { -- /* The transfer wanted something polled. Let's run all available -- * send/receives. Worst case we EAGAIN on some. */ -- /* DEBUGF(infof(data, "sendrecv, had poll sockets, RUN")); */ -+ else { -+ /* try both directions if the transfer wants it. We used to poll -+ * the socket here and on ran send/recv depending on POLLIN/OUT, but -+ * that does not when connections are multiplexed or handshake, -+ * or other direction reversals are happening. */ - select_bits = (CURL_CSELECT_OUT|CURL_CSELECT_IN); - } -- else if(data->req.keepon & KEEP_SEND_TIMED) { -- /* DEBUGF(infof(data, "sendrecv, KEEP_SEND_TIMED, RUN ul")); */ -- select_bits = CURL_CSELECT_OUT; -- } - - #ifdef USE_HYPER - if(data->conn->datastream) {
