* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2017-02-01 14:45 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2017-02-01 14:45 UTC (permalink / raw
To: gentoo-commits
commit: 5e53b2d24b8e4abb071da123a81980093c76044c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 14:44:10 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 14:45:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e53b2d2
net-misc/curl: remove unused patch
Package-Manager: portage-2.3.3
net-misc/curl/files/curl-fix-mbedtls.patch | 37 ------------------------------
1 file changed, 37 deletions(-)
diff --git a/net-misc/curl/files/curl-fix-mbedtls.patch b/net-misc/curl/files/curl-fix-mbedtls.patch
deleted file mode 100644
index b82e4c6..00000000
--- a/net-misc/curl/files/curl-fix-mbedtls.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-This addresses bug #599092
-
-https://bugs.gentoo.org/show_bug.cgi?id=599092
-
-commit 9ea3a6e150dfc822ba1565f649b634848597d2d9
-Author: Daniel Stenberg <daniel@haxx.se>
-Date: Fri Nov 4 11:13:16 2016 +0100
-
- mbedtls: fix build with mbedtls versions < 2.4.0
-
- Regression added in 62a8095e714
-
- Reported-by: Tony Kelman
-
- Discussed in #1087
-
-diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
-index 24249dd..9f29ff0 100644
---- a/lib/vtls/mbedtls.c
-+++ b/lib/vtls/mbedtls.c
-@@ -31,11 +31,15 @@
-
- #ifdef USE_MBEDTLS
-
-+#include <mbedtls/version.h>
-+#if MBEDTLS_VERSION_NUMBER >= 0x02040000
- #include <mbedtls/net_sockets.h>
-+#else
-+#include <mbedtls/net.h>
-+#endif
- #include <mbedtls/ssl.h>
- #include <mbedtls/certs.h>
- #include <mbedtls/x509.h>
--#include <mbedtls/version.h>
-
- #include <mbedtls/error.h>
- #include <mbedtls/entropy.h>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2017-08-09 12:18 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2017-08-09 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 32f0c98e76c16c47c282ea1d05307da7a4d7fd4c
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug 9 09:12:45 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Aug 9 12:18:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f0c98e
net-misc/curl: remove unused patch
net-misc/curl/files/curl-7.52.1-fix-openssl.patch | 36 -----------------------
1 file changed, 36 deletions(-)
diff --git a/net-misc/curl/files/curl-7.52.1-fix-openssl.patch b/net-misc/curl/files/curl-7.52.1-fix-openssl.patch
deleted file mode 100644
index 259f618d46e..00000000000
--- a/net-misc/curl/files/curl-7.52.1-fix-openssl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 26 Dec 2016 00:06:33 +0100
-Subject: [PATCH] vtls: s/SSLEAY/OPENSSL
-
-Fixed an old leftover use of the USE_SSLEAY define which would make a
-socket get removed from the applications sockets to monitor when the
-multi_socket API was used, leading to timeouts.
-
-Bug: #1174
----
- lib/vtls/vtls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
-index b808e1c..707f24b 100644
---- a/lib/vtls/vtls.c
-+++ b/lib/vtls/vtls.c
-@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data)
- curlssl_close_all(data);
- }
-
--#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
-+#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
- defined(USE_DARWINSSL) || defined(USE_NSS)
- /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
- int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
-@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
- (void)numsocks;
- return GETSOCK_BLANK;
- }
--/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
-+/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
- #endif
-
- void Curl_ssl_close(struct connectdata *conn, int sockindex)
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2018-01-13 22:41 David Seifert
0 siblings, 0 replies; 16+ messages in thread
From: David Seifert @ 2018-01-13 22:41 UTC (permalink / raw
To: gentoo-commits
commit: 079cc35919ab863f4562f540440f1bec75a4f3fc
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Dec 26 07:24:48 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 22:41:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079cc359
net-misc/curl: remove unused patch
net-misc/curl/files/curl-7.55.1-fix-build.patch | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/net-misc/curl/files/curl-7.55.1-fix-build.patch b/net-misc/curl/files/curl-7.55.1-fix-build.patch
deleted file mode 100644
index b9749d59c7f..00000000000
--- a/net-misc/curl/files/curl-7.55.1-fix-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-index d77a884..6dcd0f1 100644
---- a/m4/curl-confopts.m4
-+++ b/m4/curl-confopts.m4
-@@ -37,14 +37,14 @@ AC_HELP_STRING([--enable-threaded-resolver],[Enable threaded resolver])
- AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]),
- OPT_THRES=$enableval)
- case "$OPT_THRES" in
-- *)
-- dnl configure option not specified
-- want_thres="yes"
-- ;;
- no)
- dnl --disable-threaded-resolver option used
- want_thres="no"
- ;;
-+ *)
-+ dnl configure option not specified
-+ want_thres="yes"
-+ ;;
- esac
- AC_MSG_RESULT([$want_thres])
- ])
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2018-07-14 19:06 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2018-07-14 19:06 UTC (permalink / raw
To: gentoo-commits
commit: ba46800d9cfec57cc59af151967912d833be68aa
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jul 14 12:31:29 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 19:06:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba46800d
net-misc/curl: remove unused patch
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
.../files/curl-7.59.0-libressl-compatibility.patch | 70 ----------------------
1 file changed, 70 deletions(-)
diff --git a/net-misc/curl/files/curl-7.59.0-libressl-compatibility.patch b/net-misc/curl/files/curl-7.59.0-libressl-compatibility.patch
deleted file mode 100644
index e7ee6c3ab15..00000000000
--- a/net-misc/curl/files/curl-7.59.0-libressl-compatibility.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From da51ddee81e10398172f0baf3327b5db82846175 Mon Sep 17 00:00:00 2001
-From: Bernard Spil <brnrd@FreeBSD.org>
-Date: Mon, 2 Apr 2018 19:04:06 +0200
-Subject: [PATCH] openssl: fix build with LibreSSL 2.7
-
- - LibreSSL 2.7 implements (most of) OpenSSL 1.1 API
-
-Fixes #2319
-Closes #2447
-Closes #2448
-
-Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
----
- lib/vtls/openssl.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
-index 2a6b3cfac..bbb8ec766 100644
---- a/lib/vtls/openssl.c
-+++ b/lib/vtls/openssl.c
-@@ -104,7 +104,8 @@
- #endif
-
- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \
-- !defined(LIBRESSL_VERSION_NUMBER)
-+ !(defined(LIBRESSL_VERSION_NUMBER) && \
-+ LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
- #define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */
- #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */
-@@ -128,7 +129,8 @@ static unsigned long OpenSSL_version_num(void)
- #endif
-
- #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \
-- !defined(LIBRESSL_VERSION_NUMBER)
-+ !(defined(LIBRESSL_VERSION_NUMBER) && \
-+ LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #define HAVE_X509_GET0_SIGNATURE 1
- #endif
-
-@@ -147,7 +149,7 @@ static unsigned long OpenSSL_version_num(void)
- * Whether SSL_CTX_set_keylog_callback is available.
- * OpenSSL: supported since 1.1.1 https://github.com/openssl/openssl/pull/2287
- * BoringSSL: supported since d28f59c27bac (committed 2015-11-19)
-- * LibreSSL: unsupported in at least 2.5.1 (explicitly check for it since it
-+ * LibreSSL: unsupported in at least 2.7.2 (explicitly check for it since it
- * lies and pretends to be OpenSSL 2.0.0).
- */
- #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \
-@@ -259,7 +261,9 @@ static void tap_ssl_key(const SSL *ssl, ssl_tap_state_t *state)
- if(!session || !keylog_file_fp)
- return;
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
-+ !(defined(LIBRESSL_VERSION_NUMBER) && \
-+ LIBRESSL_VERSION_NUMBER < 0x20700000L)
- /* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that
- * we have a valid SSL context if we have a non-NULL session. */
- SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE);
-@@ -2082,8 +2086,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
- case CURL_SSLVERSION_TLSv1_2:
- case CURL_SSLVERSION_TLSv1_3:
- /* it will be handled later with the context options */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
-- !defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
- req_method = TLS_client_method();
- #else
- req_method = SSLv23_client_method();
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2021-06-08 16:00 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2021-06-08 16:00 UTC (permalink / raw
To: gentoo-commits
commit: 0800bfb7726311d9e4b3ba733f1321d19871b6f5
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu May 27 19:03:39 2021 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jun 8 15:59:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0800bfb7
net-misc/curl: remove unused patch
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-misc/curl/files/curl-fix-gnutls-nettle.patch | 27 ------------------------
1 file changed, 27 deletions(-)
diff --git a/net-misc/curl/files/curl-fix-gnutls-nettle.patch b/net-misc/curl/files/curl-fix-gnutls-nettle.patch
deleted file mode 100644
index fbacb7748bd..00000000000
--- a/net-misc/curl/files/curl-fix-gnutls-nettle.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur curl-7.25.0.orig//configure.ac curl-7.25.0/configure.ac
---- curl-7.25.0.orig//configure.ac 2012-04-04 17:24:48.000000000 -0400
-+++ curl-7.25.0/configure.ac 2012-04-04 17:23:07.000000000 -0400
-@@ -1823,20 +1823,9 @@
-
- if test "$GNUTLS_ENABLED" = "1"; then
- USE_GNUTLS_NETTLE=
-- # First check if we can detect either crypto library via transitive linking
-- AC_CHECK_LIB(gnutls, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
-- if test "$USE_GNUTLS_NETTLE" = ""; then
-- AC_CHECK_LIB(gnutls, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
-- fi
-- # If not, try linking directly to both of them to see if they are available
-- if test "$USE_GNUTLS_NETTLE" = ""; then
-- AC_CHECK_LIB(nettle, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
-- fi
-- if test "$USE_GNUTLS_NETTLE" = ""; then
-- AC_CHECK_LIB(gcrypt, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
-- fi
-- if test "$USE_GNUTLS_NETTLE" = ""; then
-- AC_MSG_ERROR([GnuTLS found, but neither gcrypt nor nettle found])
-+ AC_ARG_WITH(nettle)
-+ if test "x$withval" = "xyes"; then
-+ USE_GNUTLS_NETTLE=1
- fi
- if test "$USE_GNUTLS_NETTLE" = "1"; then
- AC_DEFINE(USE_GNUTLS_NETTLE, 1, [if GnuTLS uses nettle as crypto backend])
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2021-09-18 4:22 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-09-18 4:22 UTC (permalink / raw
To: gentoo-commits
commit: bc195c961bbf981a8368f108fa33ae38e4a9e1e8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 04:21:34 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 04:22:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc195c96
net-misc/curl: drop test case for response code
Fails for now, but keeping an eye upstream.
Bug: https://bugs.gentoo.org/813270
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../curl-7.79.0-http-3digit-response-code.patch | 60 ----------------------
1 file changed, 60 deletions(-)
diff --git a/net-misc/curl/files/curl-7.79.0-http-3digit-response-code.patch b/net-misc/curl/files/curl-7.79.0-http-3digit-response-code.patch
index 1da4cebd4aa..4fa70113265 100644
--- a/net-misc/curl/files/curl-7.79.0-http-3digit-response-code.patch
+++ b/net-misc/curl/files/curl-7.79.0-http-3digit-response-code.patch
@@ -45,63 +45,3 @@ Closes #7739
httpversion += 10 * httpversion_major;
switch(httpversion) {
case 10:
---- a/tests/data/Makefile.inc
-+++ b/tests/data/Makefile.inc
-@@ -182,7 +182,7 @@ test1432 test1433 test1434 test1435 test1436 test1437 test1438 test1439 \
- test1440 test1441 test1442 test1443 test1444 test1445 test1446 test1447 \
- test1448 test1449 test1450 test1451 test1452 test1453 test1454 test1455 \
- test1456 test1457 test1458 test1459 test1460 test1461 test1462 test1463 \
--test1464 test1465 \
-+test1464 test1465 test1466 \
- \
- test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \
- test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \
---- /dev/null
-+++ b/tests/data/test1466
-@@ -0,0 +1,45 @@
-+<testcase>
-+<info>
-+<keywords>
-+HTTP
-+HTTP GET
-+</keywords>
-+</info>
-+
-+<reply>
-+<data>
-+HTTP/1.1 405 405
-+Content-Length: 6
-+Connection: close
-+
-+-foo-
-+</data>
-+</reply>
-+
-+#
-+# Client-side
-+<client>
-+<server>
-+http
-+</server>
-+
-+<name>
-+HTTP GET with 3-digit response and only digits in reason
-+ </name>
-+ <command>
-+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
-+</command>
-+</client>
-+
-+#
-+# Verify data after the test has been "shot"
-+<verify>
-+<protocol>
-+GET /%TESTNUMBER HTTP/1.1
-+Host: %HOSTIP:%HTTPPORT
-+User-Agent: curl/%VERSION
-+Accept: */*
-+
-+</protocol>
-+</verify>
-+</testcase>
-
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2021-11-17 21:24 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2021-11-17 21:24 UTC (permalink / raw
To: gentoo-commits
commit: d201d8ef750dddb7e15281716702a97dbe6ca54f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Nov 16 16:52:58 2021 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Nov 17 21:24:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d201d8ef
net-misc/curl: remove unused patches
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
.../curl-7.79.0-http-3digit-response-code.patch | 47 ----------------------
.../files/curl-7.79.0-http2-connection-data.patch | 43 --------------------
2 files changed, 90 deletions(-)
diff --git a/net-misc/curl/files/curl-7.79.0-http-3digit-response-code.patch b/net-misc/curl/files/curl-7.79.0-http-3digit-response-code.patch
deleted file mode 100644
index 4fa701132651..000000000000
--- a/net-misc/curl/files/curl-7.79.0-http-3digit-response-code.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://github.com/curl/curl/commit/beb8990d934a01acf103871e463d4e61afc9ded2
-
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Fri, 17 Sep 2021 16:31:25 +0200
-Subject: [PATCH] http: fix the broken >3 digit response code detection
-
-When the "reason phrase" in the HTTP status line starts with a digit,
-that was treated as the forth response code digit and curl would claim
-the response to be non-compliant.
-
-Added test 1466 to verify this case.
-
-Regression brought by 5dc594e44f73b17
-Reported-by: Glenn de boer
-Fixes #7738
-Closes #7739
---- a/lib/http.c
-+++ b/lib/http.c
-@@ -4232,9 +4232,9 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
- char separator;
- char twoorthree[2];
- int httpversion = 0;
-- int digit4 = -1; /* should remain untouched to be good */
-+ char digit4 = 0;
- nc = sscanf(HEADER1,
-- " HTTP/%1d.%1d%c%3d%1d",
-+ " HTTP/%1d.%1d%c%3d%c",
- &httpversion_major,
- &httpversion,
- &separator,
-@@ -4250,13 +4250,13 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
-
- /* There can only be a 4th response code digit stored in 'digit4' if
- all the other fields were parsed and stored first, so nc is 5 when
-- digit4 is not -1 */
-- else if(digit4 != -1) {
-+ digit4 a digit */
-+ else if(ISDIGIT(digit4)) {
- failf(data, "Unsupported response code in HTTP response");
- return CURLE_UNSUPPORTED_PROTOCOL;
- }
-
-- if((nc == 4) && (' ' == separator)) {
-+ if((nc >= 4) && (' ' == separator)) {
- httpversion += 10 * httpversion_major;
- switch(httpversion) {
- case 10:
diff --git a/net-misc/curl/files/curl-7.79.0-http2-connection-data.patch b/net-misc/curl/files/curl-7.79.0-http2-connection-data.patch
deleted file mode 100644
index bdb1484d1b16..000000000000
--- a/net-misc/curl/files/curl-7.79.0-http2-connection-data.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/curl/curl/commit/901804ef95777b8e735a55b77f8dd630a58c575b
-
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 16 Sep 2021 08:50:54 +0200
-Subject: [PATCH] Curl_http2_setup: don't change connection data on repeat
- invokes
-
-Regression from 3cb8a748670ab88c (releasde in 7.79.0). That change moved
-transfer oriented inits to before the check but also erroneously moved a
-few connection oriented ones, which causes problems.
-
-Reported-by: Evangelos Foutras
-Fixes #7730
-Closes #7731
---- a/lib/http2.c
-+++ b/lib/http2.c
-@@ -2221,12 +2221,6 @@ CURLcode Curl_http2_setup(struct Curl_easy *data,
- stream->mem = data->state.buffer;
- stream->len = data->set.buffer_size;
-
-- httpc->inbuflen = 0;
-- httpc->nread_inbuf = 0;
--
-- httpc->pause_stream_id = 0;
-- httpc->drain_total = 0;
--
- multi_connchanged(data->multi);
- /* below this point only connection related inits are done, which only needs
- to be done once per connection */
-@@ -2252,6 +2246,12 @@ CURLcode Curl_http2_setup(struct Curl_easy *data,
- conn->httpversion = 20;
- conn->bundle->multiuse = BUNDLE_MULTIPLEX;
-
-+ httpc->inbuflen = 0;
-+ httpc->nread_inbuf = 0;
-+
-+ httpc->pause_stream_id = 0;
-+ httpc->drain_total = 0;
-+
- infof(data, "Connection state changed (HTTP/2 confirmed)");
-
- return CURLE_OK;
-
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2022-07-09 15:14 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2022-07-09 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 83d94add3a06eeb205c1b39e84477aa6a68fb825
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Jul 7 14:34:22 2022 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 15:13:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d94add
net-misc/curl: remove unused patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
.../curl/files/curl-7.82.0-certs-processing.patch | 27 -------------------
net-misc/curl/files/curl-7.83.0-http2.patch | 30 ----------------------
2 files changed, 57 deletions(-)
diff --git a/net-misc/curl/files/curl-7.82.0-certs-processing.patch b/net-misc/curl/files/curl-7.82.0-certs-processing.patch
deleted file mode 100644
index a62c1df20b30..000000000000
--- a/net-misc/curl/files/curl-7.82.0-certs-processing.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/curl/curl/issues/8559
-https://bugs.gentoo.org/836629
-
-From 911714d617c106ed5d553bf003e34ec94ab6a136 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Tue, 8 Mar 2022 13:38:13 +0100
-Subject: [PATCH] openssl: fix CN check error code
-
-Due to a missing 'else' this returns error too easily.
-
-Regressed in: d15692ebb
-
-Reported-by: Kristoffer Gleditsch
-Fixes #8559
-Closes #8560
---- a/lib/vtls/openssl.c
-+++ b/lib/vtls/openssl.c
-@@ -1817,7 +1817,8 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn,
- memcpy(peer_CN, ASN1_STRING_get0_data(tmp), peerlen);
- peer_CN[peerlen] = '\0';
- }
-- result = CURLE_OUT_OF_MEMORY;
-+ else
-+ result = CURLE_OUT_OF_MEMORY;
- }
- }
- else /* not a UTF8 name */
diff --git a/net-misc/curl/files/curl-7.83.0-http2.patch b/net-misc/curl/files/curl-7.83.0-http2.patch
deleted file mode 100644
index ede69a177b98..000000000000
--- a/net-misc/curl/files/curl-7.83.0-http2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Bug: https://bugs.gentoo.org/842780, https://github.com/curl/curl/pull/8768
-https://github.com/curl/curl/commit/6eb7fb37d901ed1e4ce07cbd628ee11bf02db1f3
-
-From 6eb7fb37d901ed1e4ce07cbd628ee11bf02db1f3 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 28 Apr 2022 17:11:50 +0200
-Subject: [PATCH] mbedtls: fix compile when h2-enabled
-
-Fixes #8766
-Reported-by: LigH-de on github
-Closes #8768
----
- lib/vtls/mbedtls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
-index 64f57c5d8321..5f9b87e6b75b 100644
---- a/lib/vtls/mbedtls.c
-+++ b/lib/vtls/mbedtls.c
-@@ -815,8 +815,8 @@ mbed_connect_step2(struct Curl_easy *data, struct connectdata *conn,
- if(next_protocol) {
- infof(data, VTLS_INFOF_ALPN_ACCEPTED_1STR, next_protocol);
- #ifdef USE_HTTP2
-- if(!strncmp(next_protocol, ALPN_H2, ALPN_H2_LEN) &&
-- !next_protocol[ALPN_H2_LEN]) {
-+ if(!strncmp(next_protocol, ALPN_H2, ALPN_H2_LENGTH) &&
-+ !next_protocol[ALPN_H2_LENGTH]) {
- conn->negnpn = CURL_HTTP_VERSION_2;
- }
- else
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2023-01-01 18:16 Conrad Kostecki
0 siblings, 0 replies; 16+ messages in thread
From: Conrad Kostecki @ 2023-01-01 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 80a271c641255263e69e23c7956789d4cf917a2d
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 27 17:07:23 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan 1 18:16:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a271c6
net-misc/curl: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28858
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-misc/curl/files/curl-7.84.0-easylock.patch | 30 ----------------------
.../curl/files/curl-7.84.0-include-sched.patch | 24 -----------------
2 files changed, 54 deletions(-)
diff --git a/net-misc/curl/files/curl-7.84.0-easylock.patch b/net-misc/curl/files/curl-7.84.0-easylock.patch
deleted file mode 100644
index 77ee610fc117..000000000000
--- a/net-misc/curl/files/curl-7.84.0-easylock.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Tue, 28 Jun 2022 09:00:25 +0200
-Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool
-
-To work with more compilers without requiring separate libs to
-link. Like with gcc-12 for RISC-V on Linux.
-
-Reported-by: Adam Sampson
-Fixes #9055
-Closes #9061
----
- lib/easy_lock.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/easy_lock.h b/lib/easy_lock.h
-index 07c85c5ffdd19..9c11bc50c5f20 100644
---- a/lib/easy_lock.h
-+++ b/lib/easy_lock.h
-@@ -40,8 +40,8 @@
- #include <sched.h>
- #endif
-
--#define curl_simple_lock atomic_bool
--#define CURL_SIMPLE_LOCK_INIT false
-+#define curl_simple_lock atomic_int
-+#define CURL_SIMPLE_LOCK_INIT 0
-
- static inline void curl_simple_lock_lock(curl_simple_lock *lock)
- {
diff --git a/net-misc/curl/files/curl-7.84.0-include-sched.patch b/net-misc/curl/files/curl-7.84.0-include-sched.patch
deleted file mode 100644
index 842310d2eaab..000000000000
--- a/net-misc/curl/files/curl-7.84.0-include-sched.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/curl/curl/commit/e2e7f54b7bea521fa8373095d0f43261a720cda0
-https://bugs.gentoo.org/855710
-
-From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 27 Jun 2022 08:46:21 +0200
-Subject: [PATCH] easy_lock.h: include sched.h if available to fix build
-
-Patched-by: Harry Sintonen
-
-Closes #9054
---- a/lib/easy_lock.h
-+++ b/lib/easy_lock.h
-@@ -36,6 +36,9 @@
-
- #elif defined (HAVE_ATOMIC)
- #include <stdatomic.h>
-+#if defined(HAVE_SCHED_YIELD)
-+#include <sched.h>
-+#endif
-
- #define curl_simple_lock atomic_bool
- #define CURL_SIMPLE_LOCK_INIT false
-
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2023-02-17 5:14 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2023-02-17 5:14 UTC (permalink / raw
To: gentoo-commits
commit: 4f70beb853611a7a7100ef265ea8b53740ce92b9
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Thu Feb 16 11:00:44 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 05:09:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f70beb8
net-misc/curl: remove unused files
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/29607
Signed-off-by: Sam James <sam <AT> gentoo.org>
...roxy-tailmatch-like-in-7.85.0-and-earlier.patch | 84 ---------------------
.../curl-7.86.0-proxy-noproxy-match-comma.patch | 86 ----------------------
.../curl-7.86.0-proxy-noproxy-tailmatching.patch | 66 -----------------
3 files changed, 236 deletions(-)
diff --git a/net-misc/curl/files/curl-7.86.0-noproxy-tailmatch-like-in-7.85.0-and-earlier.patch b/net-misc/curl/files/curl-7.86.0-noproxy-tailmatch-like-in-7.85.0-and-earlier.patch
deleted file mode 100644
index 1f04f22f9b1b..000000000000
--- a/net-misc/curl/files/curl-7.86.0-noproxy-tailmatch-like-in-7.85.0-and-earlier.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://github.com/curl/curl/issues/9842
-https://github.com/curl/curl/commit/b1953c1933b369b1217ef0f16053e26da63488c3
-
-From b1953c1933b369b1217ef0f16053e26da63488c3 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Sun, 6 Nov 2022 23:19:51 +0100
-Subject: [PATCH] noproxy: tailmatch like in 7.85.0 and earlier
-
-A regfression in 7.86.0 (via 1e9a538e05c010) made the tailmatch work
-differently than before. This restores the logic to how it used to work:
-
-All names listed in NO_PROXY are tailmatched against the used domain
-name, if the lengths are identical it needs a full match.
-
-Update the docs, update test 1614.
-
-Reported-by: Stuart Henderson
-Fixes #9842
-Closes #9858
----
- docs/libcurl/opts/CURLOPT_NOPROXY.3 | 4 ----
- lib/noproxy.c | 32 +++++++++++++++--------------
- tests/unit/unit1614.c | 3 ++-
- 3 files changed, 19 insertions(+), 20 deletions(-)
-
-diff --git a/docs/libcurl/opts/CURLOPT_NOPROXY.3 b/docs/libcurl/opts/CURLOPT_NOPROXY.3
-index 5e4c32130431..dc3cf7c10833 100644
---- a/docs/libcurl/opts/CURLOPT_NOPROXY.3
-+++ b/docs/libcurl/opts/CURLOPT_NOPROXY.3
-@@ -40,10 +40,6 @@ list is matched as either a domain which contains the hostname, or the
- hostname itself. For example, "ample.com" would match ample.com, ample.com:80,
- and www.ample.com, but not www.example.com or ample.com.org.
-
--If the name in the \fInoproxy\fP list has a leading period, it is a domain
--match against the provided host name. This way ".example.com" will switch off
--proxy use for both "www.example.com" as well as for "foo.example.com".
--
- Setting the \fInoproxy\fP string to "" (an empty string) will explicitly
- enable the proxy for all host names, even if there is an environment variable
- set for it.
-diff --git a/lib/noproxy.c b/lib/noproxy.c
-index 2832ae166a5b..fb856e4faa72 100644
---- a/lib/noproxy.c
-+++ b/lib/noproxy.c
-@@ -187,22 +187,24 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy)
- tokenlen--;
-
- if(tokenlen && (*token == '.')) {
-- /* A: example.com matches '.example.com'
-- B: www.example.com matches '.example.com'
-- C: nonexample.com DOES NOT match '.example.com'
-- */
-- if((tokenlen - 1) == namelen)
-- /* case A, exact match without leading dot */
-- match = strncasecompare(token + 1, name, namelen);
-- else if(tokenlen < namelen)
-- /* case B, tailmatch with leading dot */
-- match = strncasecompare(token, name + (namelen - tokenlen),
-- tokenlen);
-- /* case C passes through, not a match */
-+ /* ignore leading token dot as well */
-+ token++;
-+ tokenlen--;
- }
-- else
-- match = (tokenlen == namelen) &&
-- strncasecompare(token, name, namelen);
-+ /* A: example.com matches 'example.com'
-+ B: www.example.com matches 'example.com'
-+ C: nonexample.com DOES NOT match 'example.com'
-+ */
-+ if(tokenlen == namelen)
-+ /* case A, exact match */
-+ match = strncasecompare(token, name, namelen);
-+ else if(tokenlen < namelen) {
-+ /* case B, tailmatch domain */
-+ match = (name[namelen - tokenlen - 1] == '.') &&
-+ strncasecompare(token, name + (namelen - tokenlen),
-+ tokenlen);
-+ }
-+ /* case C passes through, not a match */
- break;
- case TYPE_IPV4:
- /* FALLTHROUGH */
diff --git a/net-misc/curl/files/curl-7.86.0-proxy-noproxy-match-comma.patch b/net-misc/curl/files/curl-7.86.0-proxy-noproxy-match-comma.patch
deleted file mode 100644
index 6c8f4067e8d5..000000000000
--- a/net-misc/curl/files/curl-7.86.0-proxy-noproxy-match-comma.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://bugs.gentoo.org/878365#c2
-https://github.com/curl/curl/issues/9813
-https://github.com/curl/curl/commit/efc286b7a62af0568fdcbf3c68791c9955182128
-
-From efc286b7a62af0568fdcbf3c68791c9955182128 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 27 Oct 2022 13:54:27 +0200
-Subject: [PATCH] noproxy: also match with adjacent comma
-
-If the host name is an IP address and the noproxy string contained that
-IP address with a following comma, it would erroneously not match.
-
-Extended test 1614 to verify this combo as well.
-
-Reported-by: Henning Schild
-
-Fixes #9813
-Closes #9814
---- a/lib/noproxy.c
-+++ b/lib/noproxy.c
-@@ -192,18 +192,22 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy)
- /* FALLTHROUGH */
- case TYPE_IPV6: {
- const char *check = token;
-- char *slash = strchr(check, '/');
-+ char *slash;
- unsigned int bits = 0;
- char checkip[128];
-+ if(tokenlen >= sizeof(checkip))
-+ /* this cannot match */
-+ break;
-+ /* copy the check name to a temp buffer */
-+ memcpy(checkip, check, tokenlen);
-+ checkip[tokenlen] = 0;
-+ check = checkip;
-+
-+ slash = strchr(check, '/');
- /* if the slash is part of this token, use it */
-- if(slash && (slash < &check[tokenlen])) {
-+ if(slash) {
- bits = atoi(slash + 1);
-- /* copy the check name to a temp buffer */
-- if(tokenlen >= sizeof(checkip))
-- break;
-- memcpy(checkip, check, tokenlen);
-- checkip[ slash - check ] = 0;
-- check = checkip;
-+ *slash = 0; /* null terminate there */
- }
- if(type == TYPE_IPV6)
- match = Curl_cidr6_match(name, check, bits);
---- a/tests/data/test1614
-+++ b/tests/data/test1614
-@@ -16,7 +16,7 @@ unittest
- proxy
- </features>
- <name>
--cidr comparisons
-+noproxy and cidr comparisons
- </name>
- </client>
- <errorcode>
---- a/tests/unit/unit1614.c
-+++ b/tests/unit/unit1614.c
-@@ -77,6 +77,20 @@ UNITTEST_START
- { NULL, NULL, 0, FALSE} /* end marker */
- };
- struct noproxy list[]= {
-+ { "127.0.0.1", "127.0.0.1,localhost", TRUE},
-+ { "127.0.0.1", "127.0.0.1,localhost,", TRUE},
-+ { "127.0.0.1", "127.0.0.1/8,localhost,", TRUE},
-+ { "127.0.0.1", "127.0.0.1/28,localhost,", TRUE},
-+ { "127.0.0.1", "127.0.0.1/31,localhost,", TRUE},
-+ { "127.0.0.1", "localhost,127.0.0.1", TRUE},
-+ { "127.0.0.1", "localhost,127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1."
-+ "127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127."
-+ "0.0.1.127.0.0.1.127.0.0." /* 128 bytes "address" */, FALSE},
-+ { "127.0.0.1", "localhost,127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1."
-+ "127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127."
-+ "0.0.1.127.0.0.1.127.0.0" /* 127 bytes "address" */, FALSE},
-+ { "localhost", "localhost,127.0.0.1", TRUE},
-+ { "localhost", "127.0.0.1,localhost", TRUE},
- { "foobar", "barfoo", FALSE},
- { "foobar", "foobar", TRUE},
- { "192.168.0.1", "foobar", FALSE},
-
diff --git a/net-misc/curl/files/curl-7.86.0-proxy-noproxy-tailmatching.patch b/net-misc/curl/files/curl-7.86.0-proxy-noproxy-tailmatching.patch
deleted file mode 100644
index 15f5e64c91f3..000000000000
--- a/net-misc/curl/files/curl-7.86.0-proxy-noproxy-tailmatching.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/878365#c2
-https://github.com/curl/curl/issues/9821
-https://github.com/curl/curl/commit/b830f9ba9e94acf672cd191993ff679fa888838b
-
-From b830f9ba9e94acf672cd191993ff679fa888838b Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Fri, 28 Oct 2022 10:51:49 +0200
-Subject: [PATCH] noproxy: fix tail-matching
-
-Also ignore trailing dots in both host name and comparison pattern.
-
-Regression in 7.86.0 (from 1e9a538e05c0)
-
-Extended test 1614 to verify better.
-
-Reported-by: Henning Schild
-Fixes #9821
-Closes #9822
---- a/lib/noproxy.c
-+++ b/lib/noproxy.c
-@@ -153,9 +153,14 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy)
- }
- else {
- unsigned int address;
-+ namelen = strlen(name);
- if(1 == Curl_inet_pton(AF_INET, name, &address))
- type = TYPE_IPV4;
-- namelen = strlen(name);
-+ else {
-+ /* ignore trailing dots in the host name */
-+ if(name[namelen - 1] == '.')
-+ namelen--;
-+ }
- }
-
- while(*p) {
-@@ -177,12 +182,23 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy)
- if(tokenlen) {
- switch(type) {
- case TYPE_HOST:
-- if(*token == '.') {
-- ++token;
-- --tokenlen;
-- /* tailmatch */
-- match = (tokenlen <= namelen) &&
-- strncasecompare(token, name + (namelen - tokenlen), namelen);
-+ /* ignore trailing dots in the token to check */
-+ if(token[tokenlen - 1] == '.')
-+ tokenlen--;
-+
-+ if(tokenlen && (*token == '.')) {
-+ /* A: example.com matches '.example.com'
-+ B: www.example.com matches '.example.com'
-+ C: nonexample.com DOES NOT match '.example.com'
-+ */
-+ if((tokenlen - 1) == namelen)
-+ /* case A, exact match without leading dot */
-+ match = strncasecompare(token + 1, name, namelen);
-+ else if(tokenlen < namelen)
-+ /* case B, tailmatch with leading dot */
-+ match = strncasecompare(token, name + (namelen - tokenlen),
-+ tokenlen);
-+ /* case C passes through, not a match */
- }
- else
- match = (tokenlen == namelen) &&
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2023-02-22 10:00 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2023-02-22 10:00 UTC (permalink / raw
To: gentoo-commits
commit: 6b3e4a4fb0e7658dcaaae0dcc3592d36757cd08f
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Wed Feb 22 08:51:26 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 09:59:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3e4a4f
net-misc/curl: remove overlooked patches
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/29716
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/curl/files/curl-7.88.0-http2.patch | 93 ---------------------
net-misc/curl/files/curl-7.88.0-tests.patch | 120 ----------------------------
2 files changed, 213 deletions(-)
diff --git a/net-misc/curl/files/curl-7.88.0-http2.patch b/net-misc/curl/files/curl-7.88.0-http2.patch
deleted file mode 100644
index 49d90e901823..000000000000
--- a/net-misc/curl/files/curl-7.88.0-http2.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://github.com/curl/curl/commit/87ed650d04dc1a6f7944a5d952f7d5b0934a19ac
-Author: Harry Sintonen <sintonen@iki.fi>
-Date: Thu Feb 16 06:26:26 2023 +0200
-
- http2: set drain on stream end
-
- Ensure that on_frame_recv() stream end will trigger a read if there is
- pending data. Without this it could happen that the pending data is
- never consumed.
-
- This combined with https://github.com/curl/curl/pull/10529 should fix
- https://github.com/curl/curl/issues/10525
-
- Ref: https://github.com/curl/curl/issues/10525
- Closes #10530
-
---- a/lib/http2.c
-+++ b/lib/http2.c
-@@ -868,6 +868,14 @@ static int on_frame_recv(nghttp2_session *session, const nghttp2_frame *frame,
- return NGHTTP2_ERR_CALLBACK_FAILURE;
- }
- }
-+ if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-+ /* Stream has ended. If there is pending data, ensure that read
-+ will occur to consume it. */
-+ if(!data->state.drain && stream->memlen) {
-+ drain_this(cf, data_s);
-+ Curl_expire(data, 0, EXPIRE_RUN_NOW);
-+ }
-+ }
- break;
- case NGHTTP2_HEADERS:
- DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] recv frame HEADERS", stream_id));
-
-https://github.com/curl/curl/commit/3103de2053ca8cacf9cdbe78764ba6814481709f
-Author: Stefan Eissing <stefan@eissing.org>
-Date: Wed Feb 15 22:11:13 2023 +0100
-
- http2: buffer/pausedata and output flush fix.
-
- * do not process pending input data when copying pausedata to the
- caller
- * return CURLE_AGAIN if the output buffer could not be completely
- written out.
-
- Ref: #10525
- Closes #10529
-
---- a/lib/http2.c
-+++ b/lib/http2.c
-@@ -467,6 +467,7 @@ static CURLcode flush_output(struct Curl_cfilter *cf,
- }
- if((size_t)written < buflen) {
- Curl_dyn_tail(&ctx->outbuf, buflen - (size_t)written);
-+ return CURLE_AGAIN;
- }
- else {
- Curl_dyn_reset(&ctx->outbuf);
-@@ -1790,6 +1791,7 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
-
- stream->pausedata += nread;
- stream->pauselen -= nread;
-+ drain_this(cf, data);
-
- if(stream->pauselen == 0) {
- DEBUGF(LOG_CF(data, cf, "[h2sid=%u] Unpaused", stream->stream_id));
-@@ -1798,18 +1800,6 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
-
- stream->pausedata = NULL;
- stream->pauselen = 0;
--
-- /* When NGHTTP2_ERR_PAUSE is returned from
-- data_source_read_callback, we might not process DATA frame
-- fully. Calling nghttp2_session_mem_recv() again will
-- continue to process DATA frame, but if there is no incoming
-- frames, then we have to call it again with 0-length data.
-- Without this, on_stream_close callback will not be called,
-- and stream could be hanged. */
-- if(h2_process_pending_input(cf, data, err) != 0) {
-- nread = -1;
-- goto out;
-- }
- }
- DEBUGF(LOG_CF(data, cf, "[h2sid=%u] recv: returns unpaused %zd bytes",
- stream->stream_id, nread));
-@@ -1933,6 +1923,7 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
- drained_transfer(cf, data);
- }
-
-+ *err = CURLE_OK;
- nread = retlen;
- DEBUGF(LOG_CF(data, cf, "[h2sid=%u] cf_h2_recv -> %zd",
- stream->stream_id, nread));
diff --git a/net-misc/curl/files/curl-7.88.0-tests.patch b/net-misc/curl/files/curl-7.88.0-tests.patch
deleted file mode 100644
index 81131dc6bc64..000000000000
--- a/net-misc/curl/files/curl-7.88.0-tests.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-https://github.com/curl/curl/commit/f1d09231adfc695d15995b9ef2c8c6e568c28091
-Author: Stefan Eissing <stefan@eissing.org>
-Date: Tue Feb 14 14:29:13 2023 +0100
-
- tests: make the telnet server shut down a socket gracefully
-
- - test 1452 failed occasionally with ECONNRESET errnos in curl when the
- server closed the connection in an unclean state.
-
- Closes #10509
-
---- a/tests/negtelnetserver.py
-+++ b/tests/negtelnetserver.py
-@@ -29,7 +29,9 @@ from __future__ import (absolute_import, division, print_function,
- import argparse
- import logging
- import os
-+import socket
- import sys
-+import time
-
- from util import ClosingFileHandler
-
-@@ -90,7 +92,7 @@ class NegotiatingTelnetHandler(socketserver.BaseRequestHandler):
- neg.send_wont("NAWS")
-
- # Get the data passed through the negotiator
-- data = neg.recv(1024)
-+ data = neg.recv(4*1024)
- log.debug("Incoming data: %r", data)
-
- if VERIFIED_REQ.encode('utf-8') in data:
-@@ -109,6 +111,12 @@ class NegotiatingTelnetHandler(socketserver.BaseRequestHandler):
- log.debug("Sending %r", response_data)
- self.request.sendall(response_data)
-
-+ # put some effort into making a clean socket shutdown
-+ # that does not give the client ECONNRESET
-+ self.request.settimeout(0.1)
-+ self.request.recv(4*1024)
-+ self.request.shutdown(socket.SHUT_RDWR)
-+
- except IOError:
- log.exception("IOError hit during request")
-
-
-https://github.com/curl/curl/commit/2fdc1d816ebf3c77f43068103bec1b3a3767881a
-Author: Daniel Stenberg <daniel@haxx.se>
-Date: Wed Feb 15 15:04:07 2023 +0100
-
- tests: make sure gnuserv-tls has SRP support before using it
-
- Reported-by: fundawang on github
- Fixes #10522
- Closes #10524
-
---- a/tests/runtests.pl
-+++ b/tests/runtests.pl
-@@ -5382,7 +5382,7 @@ sub startservers {
- elsif($what eq "httptls") {
- if(!$httptlssrv) {
- # for now, we can't run http TLS-EXT tests without gnutls-serv
-- return "no gnutls-serv";
-+ return "no gnutls-serv (with SRP support)";
- }
- if($torture && $run{'httptls'} &&
- !responsive_httptls_server($verbose, "IPv4")) {
---- a/tests/sshhelp.pm
-+++ b/tests/sshhelp.pm
-@@ -408,7 +408,16 @@ sub find_sshkeygen {
- # Find httptlssrv (gnutls-serv) and return canonical filename
- #
- sub find_httptlssrv {
-- return find_exe_file_hpath($httptlssrvexe);
-+ my $p = find_exe_file_hpath($httptlssrvexe);
-+ my @o = `$p -l`;
-+ my $found;
-+ for(@o) {
-+ if(/Key exchange: SRP/) {
-+ $found = 1;
-+ last;
-+ }
-+ }
-+ return $p if($found);
- }
-
-
-
-https://github.com/curl/curl/commit/79d0b3c0c0bb00829f10ec139dbf3823c249ae72
-Author: Daniel Stenberg <daniel@haxx.se>
-Date: Wed Feb 15 13:03:21 2023 +0100
-
- runtests: fix "uninitialized value $port"
-
- by using a more appropriate variable
-
- Reported-by: fundawang on github
- Fixes #10518
- Closes #10520
-
---- a/tests/runtests.pl
-+++ b/tests/runtests.pl
-@@ -1740,7 +1740,7 @@ sub runhttpserver {
- }
-
- # where is it?
-- my $port;
-+ my $port = 0;
- if(!$port_or_path) {
- $port = $port_or_path = pidfromfile($portfile);
- }
-@@ -1758,7 +1758,7 @@ sub runhttpserver {
- $pid2 = $pid3;
-
- if($verbose) {
-- logmsg "RUN: $srvrname server is on PID $httppid port $port\n";
-+ logmsg "RUN: $srvrname server is on PID $httppid port $port_or_path\n";
- }
-
- return ($httppid, $pid2, $port);
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2023-03-23 8:59 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2023-03-23 8:59 UTC (permalink / raw
To: gentoo-commits
commit: 467268668fb1f89414b460457d80402636fb8a26
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 08:56:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 08:59:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46726866
net-misc/curl: add bug ref to older patch variant
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/curl/files/curl-7.88.1-onion-resolution.patch | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net-misc/curl/files/curl-7.88.1-onion-resolution.patch b/net-misc/curl/files/curl-7.88.1-onion-resolution.patch
index 05519884653c..d3385623da5f 100644
--- a/net-misc/curl/files/curl-7.88.1-onion-resolution.patch
+++ b/net-misc/curl/files/curl-7.88.1-onion-resolution.patch
@@ -1,4 +1,6 @@
+https://bugs.gentoo.org/887287
https://github.com/curl/curl/pull/10705
+
From: Matt Jolly <Matt.Jolly@footclan.ninja>
Date: Wed, 8 Mar 2023 02:16:45 +1100
Subject: [PATCH] Refuse to resolve the .onion TLD.
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2023-06-10 9:16 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2023-06-10 9:16 UTC (permalink / raw
To: gentoo-commits
commit: cc1824275e07e2a2b7c3f516b25eb0832cd0e716
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jun 10 08:27:11 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 09:16:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc182427
net-misc/curl: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31371
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 86 --------
.../curl/files/curl-8.1.0-numeric-hostname.patch | 227 ---------------------
.../curl/files/curl-8.1.1-configure-compiler.patch | 73 -------
net-misc/curl/files/curl-8.1.1-hanging-http2.patch | 36 ----
4 files changed, 422 deletions(-)
diff --git a/net-misc/curl/files/curl-8.1.0-header-length.patch b/net-misc/curl/files/curl-8.1.0-header-length.patch
deleted file mode 100644
index 6229fd817f2a..000000000000
--- a/net-misc/curl/files/curl-8.1.0-header-length.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://github.com/curl/curl/commit/77c9a9845bbee66f3aff158b8452dc8cd963cbd5.patch
-From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
-Date: Thu, 18 May 2023 18:22:57 +0200
-Subject: [PATCH] http2: double http request parser max line length
-
-This works around #11138, by doubling the limit, and should be a
-relatively safe fix.
-
-Ideally the buffer would grow as needed and there would be no need for a
-limit? But that might be follow-up material.
-
-Fixes #11138
-Closes #11139
----
- lib/http1.h | 2 ++
- lib/http2.c | 2 +-
- lib/vquic/curl_msh3.c | 2 +-
- lib/vquic/curl_ngtcp2.c | 2 +-
- lib/vquic/curl_quiche.c | 2 +-
- 5 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/lib/http1.h b/lib/http1.h
-index c2d107587a6f8..8acb9db401a95 100644
---- a/lib/http1.h
-+++ b/lib/http1.h
-@@ -33,6 +33,8 @@
- #define H1_PARSE_OPT_NONE (0)
- #define H1_PARSE_OPT_STRICT (1 << 0)
-
-+#define H1_PARSE_DEFAULT_MAX_LINE_LEN (8 * 1024)
-+
- struct h1_req_parser {
- struct http_req *req;
- struct bufq scratch;
-diff --git a/lib/http2.c b/lib/http2.c
-index 47e6f71393156..4e3b182b8d815 100644
---- a/lib/http2.c
-+++ b/lib/http2.c
-@@ -1860,7 +1860,7 @@ static ssize_t h2_submit(struct stream_ctx **pstream,
- nghttp2_priority_spec pri_spec;
- ssize_t nwritten;
-
-- Curl_h1_req_parse_init(&h1, (4*1024));
-+ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);
- Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST);
-
- *err = http2_data_setup(cf, data, &stream);
-diff --git a/lib/vquic/curl_msh3.c b/lib/vquic/curl_msh3.c
-index 40e89379fc402..173886739b6dc 100644
---- a/lib/vquic/curl_msh3.c
-+++ b/lib/vquic/curl_msh3.c
-@@ -575,7 +575,7 @@ static ssize_t cf_msh3_send(struct Curl_cfilter *cf, struct Curl_easy *data,
-
- CF_DATA_SAVE(save, cf, data);
-
-- Curl_h1_req_parse_init(&h1, (4*1024));
-+ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);
- Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST);
-
- /* Sizes must match for cast below to work" */
-diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c
-index 05f960afdffa1..7794f148c6ec9 100644
---- a/lib/vquic/curl_ngtcp2.c
-+++ b/lib/vquic/curl_ngtcp2.c
-@@ -1550,7 +1550,7 @@ static ssize_t h3_stream_open(struct Curl_cfilter *cf,
- nghttp3_data_reader reader;
- nghttp3_data_reader *preader = NULL;
-
-- Curl_h1_req_parse_init(&h1, (4*1024));
-+ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);
- Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST);
-
- *err = h3_data_setup(cf, data);
-diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c
-index 392b9beb83c59..c63e8e10a22e0 100644
---- a/lib/vquic/curl_quiche.c
-+++ b/lib/vquic/curl_quiche.c
-@@ -913,7 +913,7 @@ static ssize_t h3_open_stream(struct Curl_cfilter *cf,
- DEBUGASSERT(stream);
- }
-
-- Curl_h1_req_parse_init(&h1, (4*1024));
-+ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);
- Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST);
-
- DEBUGASSERT(stream);
diff --git a/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch b/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch
deleted file mode 100644
index 6a0dd1382d62..000000000000
--- a/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-https://github.com/curl/curl/commit/92772e6d395bbdda0e7822d980caf86e8c4aa51c.patch
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 18 May 2023 00:31:17 +0200
-Subject: [PATCH] urlapi: allow numerical parts in the host name
-
-It can only be an IPv4 address if all parts are all digits and no more than
-four parts, otherwise it is a host name. Even slightly wrong IPv4 will now be
-passed through as a host name.
-
-Regression from 17a15d88467 shipped in 8.1.0
-
-Extended test 1560 accordingly.
-
-Reported-by: Pavel Kalyugin
-Fixes #11129
-Closes #11131
---- a/lib/urlapi.c
-+++ b/lib/urlapi.c
-@@ -34,6 +34,7 @@
- #include "inet_ntop.h"
- #include "strdup.h"
- #include "idn.h"
-+#include "curl_memrchr.h"
-
- /* The last 3 #include files should be in this order */
- #include "curl_printf.h"
-@@ -643,8 +644,8 @@ static CURLUcode hostname_check(struct Curl_URL *u, char *hostname,
- * Handle partial IPv4 numerical addresses and different bases, like
- * '16843009', '0x7f', '0x7f.1' '0177.1.1.1' etc.
- *
-- * If the given input string is syntactically wrong or any part for example is
-- * too big, this function returns FALSE and doesn't create any output.
-+ * If the given input string is syntactically wrong IPv4 or any part for
-+ * example is too big, this function returns HOST_NAME.
- *
- * Output the "normalized" version of that input string in plain quad decimal
- * integers.
-@@ -675,7 +676,7 @@ static int ipv4_normalize(struct dynbuf *host)
- unsigned long l;
- if(!ISDIGIT(*c))
- /* most importantly this doesn't allow a leading plus or minus */
-- return n ? HOST_BAD : HOST_NAME;
-+ return HOST_NAME;
- l = strtoul(c, &endp, 0);
-
- parts[n] = l;
-@@ -684,7 +685,7 @@ static int ipv4_normalize(struct dynbuf *host)
- switch(*c) {
- case '.':
- if(n == 3)
-- return HOST_BAD;
-+ return HOST_NAME;
- n++;
- c++;
- break;
-@@ -694,39 +695,40 @@ static int ipv4_normalize(struct dynbuf *host)
- break;
-
- default:
-- return n ? HOST_BAD : HOST_NAME;
-+ return HOST_NAME;
- }
-
- /* overflow */
- if((l == ULONG_MAX) && (errno == ERANGE))
-- return HOST_BAD;
-+ return HOST_NAME;
-
- #if SIZEOF_LONG > 4
- /* a value larger than 32 bits */
- if(l > UINT_MAX)
-- return HOST_BAD;
-+ return HOST_NAME;
- #endif
- }
-
-- /* this is a valid IPv4 numerical address */
-- Curl_dyn_reset(host);
--
- switch(n) {
- case 0: /* a -- 32 bits */
-+ Curl_dyn_reset(host);
-+
- result = Curl_dyn_addf(host, "%u.%u.%u.%u",
- parts[0] >> 24, (parts[0] >> 16) & 0xff,
- (parts[0] >> 8) & 0xff, parts[0] & 0xff);
- break;
- case 1: /* a.b -- 8.24 bits */
- if((parts[0] > 0xff) || (parts[1] > 0xffffff))
-- return HOST_BAD;
-+ return HOST_NAME;
-+ Curl_dyn_reset(host);
- result = Curl_dyn_addf(host, "%u.%u.%u.%u",
- parts[0], (parts[1] >> 16) & 0xff,
- (parts[1] >> 8) & 0xff, parts[1] & 0xff);
- break;
- case 2: /* a.b.c -- 8.8.16 bits */
- if((parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xffff))
-- return HOST_BAD;
-+ return HOST_NAME;
-+ Curl_dyn_reset(host);
- result = Curl_dyn_addf(host, "%u.%u.%u.%u",
- parts[0], parts[1], (parts[2] >> 8) & 0xff,
- parts[2] & 0xff);
-@@ -734,7 +736,8 @@ static int ipv4_normalize(struct dynbuf *host)
- case 3: /* a.b.c.d -- 8.8.8.8 bits */
- if((parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xff) ||
- (parts[3] > 0xff))
-- return HOST_BAD;
-+ return HOST_NAME;
-+ Curl_dyn_reset(host);
- result = Curl_dyn_addf(host, "%u.%u.%u.%u",
- parts[0], parts[1], parts[2], parts[3]);
- break;
-@@ -796,6 +799,9 @@ static CURLUcode parse_authority(struct Curl_URL *u,
- if(result)
- goto out;
-
-+ if(!Curl_dyn_len(host))
-+ return CURLUE_NO_HOST;
-+
- switch(ipv4_normalize(host)) {
- case HOST_IPV4:
- break;
---- a/tests/libtest/lib1560.c
-+++ b/tests/libtest/lib1560.c
-@@ -474,6 +474,13 @@ static const struct testcase get_parts_list[] ={
- };
-
- static const struct urltestcase get_url_list[] = {
-+ {"https://1.0x1000000", "https://1.0x1000000/", 0, 0, CURLUE_OK},
-+ {"https://0x7f.1", "https://127.0.0.1/", 0, 0, CURLUE_OK},
-+ {"https://1.2.3.256.com", "https://1.2.3.256.com/", 0, 0, CURLUE_OK},
-+ {"https://10.com", "https://10.com/", 0, 0, CURLUE_OK},
-+ {"https://1.2.com", "https://1.2.com/", 0, 0, CURLUE_OK},
-+ {"https://1.2.3.com", "https://1.2.3.com/", 0, 0, CURLUE_OK},
-+ {"https://1.2.com.99", "https://1.2.com.99/", 0, 0, CURLUE_OK},
- {"https://[fe80::0000:20c:29ff:fe9c:409b]:80/moo",
- "https://[fe80::20c:29ff:fe9c:409b]:80/moo",
- 0, 0, CURLUE_OK},
-@@ -522,22 +529,24 @@ static const struct urltestcase get_url_list[] = {
-
- /* IPv4 trickeries */
- {"https://16843009", "https://1.1.1.1/", 0, 0, CURLUE_OK},
-- {"https://0x7f.1", "https://127.0.0.1/", 0, 0, CURLUE_OK},
- {"https://0177.1", "https://127.0.0.1/", 0, 0, CURLUE_OK},
- {"https://0111.02.0x3", "https://73.2.0.3/", 0, 0, CURLUE_OK},
-+ {"https://0111.02.0x3.", "https://0111.02.0x3./", 0, 0, CURLUE_OK},
-+ {"https://0111.02.030", "https://73.2.0.24/", 0, 0, CURLUE_OK},
-+ {"https://0111.02.030.", "https://0111.02.030./", 0, 0, CURLUE_OK},
- {"https://0xff.0xff.0377.255", "https://255.255.255.255/", 0, 0, CURLUE_OK},
- {"https://1.0xffffff", "https://1.255.255.255/", 0, 0, CURLUE_OK},
- /* IPv4 numerical overflows or syntax errors will not normalize */
- {"https://a127.0.0.1", "https://a127.0.0.1/", 0, 0, CURLUE_OK},
- {"https://\xff.127.0.0.1", "https://%FF.127.0.0.1/", 0, CURLU_URLENCODE,
- CURLUE_OK},
-- {"https://127.-0.0.1", "https://127.-0.0.1/", 0, 0, CURLUE_BAD_HOSTNAME},
-+ {"https://127.-0.0.1", "https://127.-0.0.1/", 0, 0, CURLUE_OK},
- {"https://127.0. 1", "https://127.0.0.1/", 0, 0, CURLUE_MALFORMED_INPUT},
-- {"https://1.0x1000000", "https://1.0x1000000/", 0, 0, CURLUE_BAD_HOSTNAME},
-- {"https://1.2.3.256", "https://1.2.3.256/", 0, 0, CURLUE_BAD_HOSTNAME},
-- {"https://1.2.3.4.5", "https://1.2.3.4.5/", 0, 0, CURLUE_BAD_HOSTNAME},
-- {"https://1.2.0x100.3", "https://1.2.0x100.3/", 0, 0, CURLUE_BAD_HOSTNAME},
-- {"https://4294967296", "https://4294967296/", 0, 0, CURLUE_BAD_HOSTNAME},
-+ {"https://1.2.3.256", "https://1.2.3.256/", 0, 0, CURLUE_OK},
-+ {"https://1.2.3.256.", "https://1.2.3.256./", 0, 0, CURLUE_OK},
-+ {"https://1.2.3.4.5", "https://1.2.3.4.5/", 0, 0, CURLUE_OK},
-+ {"https://1.2.0x100.3", "https://1.2.0x100.3/", 0, 0, CURLUE_OK},
-+ {"https://4294967296", "https://4294967296/", 0, 0, CURLUE_OK},
- {"https://123host", "https://123host/", 0, 0, CURLUE_OK},
- /* 40 bytes scheme is the max allowed */
- {"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA://hostname/path",
-@@ -599,20 +608,11 @@ static const struct urltestcase get_url_list[] = {
- 0, 0, CURLUE_OK},
- /* here the password has the semicolon */
- {"http://user:pass;word@host/file",
-- "http://user:pass;word@host/file",
-- 0, 0, CURLUE_OK},
-- {"file:///file.txt#moo",
-- "file:///file.txt#moo",
-- 0, 0, CURLUE_OK},
-- {"file:////file.txt",
-- "file:////file.txt",
-- 0, 0, CURLUE_OK},
-- {"file:///file.txt",
-- "file:///file.txt",
-- 0, 0, CURLUE_OK},
-- {"file:./",
-- "file://",
-- 0, 0, CURLUE_BAD_SCHEME},
-+ "http://user:pass;word@host/file", 0, 0, CURLUE_OK},
-+ {"file:///file.txt#moo", "file:///file.txt#moo", 0, 0, CURLUE_OK},
-+ {"file:////file.txt", "file:////file.txt", 0, 0, CURLUE_OK},
-+ {"file:///file.txt", "file:///file.txt", 0, 0, CURLUE_OK},
-+ {"file:./", "file://", 0, 0, CURLUE_OK},
- {"http://example.com/hello/../here",
- "http://example.com/hello/../here",
- CURLU_PATH_AS_IS, 0, CURLUE_OK},
-@@ -1124,7 +1124,7 @@ static int get_url(void)
- }
- curl_free(url);
- }
-- else if(rc != get_url_list[i].ucode) {
-+ if(rc != get_url_list[i].ucode) {
- fprintf(stderr, "Get URL\nin: %s\nreturned %d (expected %d)\n",
- get_url_list[i].in, (int)rc, get_url_list[i].ucode);
- error++;
-@@ -1515,6 +1515,9 @@ int test(char *URL)
- {
- (void)URL; /* not used */
-
-+ if(get_url())
-+ return 3;
-+
- if(huge())
- return 9;
-
-@@ -1533,9 +1536,6 @@ int test(char *URL)
- if(set_parts())
- return 2;
-
-- if(get_url())
-- return 3;
--
- if(get_parts())
- return 4;
-
diff --git a/net-misc/curl/files/curl-8.1.1-configure-compiler.patch b/net-misc/curl/files/curl-8.1.1-configure-compiler.patch
deleted file mode 100644
index f769b35880cf..000000000000
--- a/net-misc/curl/files/curl-8.1.1-configure-compiler.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-The check for "basic compiler options" hangs otherwise.
-
-https://github.com/curl/curl/commit/471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36
-https://github.com/curl/curl/commit/c4a019603b82a08c3572591a9393df0818ee02f6
-
-From 471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Tue, 23 May 2023 09:40:18 +0200
-Subject: [PATCH] configure: quote the assignments for run-compiler
-
-Building for multilib failed, as the compiler command contains an
-extra argument. That needs quoting.
-
-Regression from b78ca50cb3dda361f9c1
-
-Fixes #11179
-Closes #11180
---- a/configure.ac
-+++ b/configure.ac
-@@ -193,8 +193,8 @@ dnl something different but only have that affect the execution of the results
- dnl of the compile, not change the libraries for the compiler itself.
- dnl
- compilersh="run-compiler"
--echo "CC=$CC" > $compilersh
--echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $compilersh
-+echo "CC=\"$CC\"" > $compilersh
-+echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh
- echo 'exec $CC $@' >> $compilersh
-
- dnl **********************************************************************
-
-From c4a019603b82a08c3572591a9393df0818ee02f6 Mon Sep 17 00:00:00 2001
-From: Emanuele Torre <torreemanuele6@gmail.com>
-Date: Tue, 23 May 2023 11:59:59 +0200
-Subject: [PATCH] configure: fix build with arbitrary CC and LD_LIBRARY_PATH
-
-Since ./configure and processes that inherit its environment variables
-are the only callers of the run-compiler script, we can just save the
-current value of the LD_LIBRARY_PATH and CC variables to another pair of
-environment variables, and make run-compiler a static script that
-simply restores CC and LD_LIBRARY_PATH to the saved value, and before
-running the compiler.
-
-This avoids having to inject the values of the variables in the script,
-possibly causing problems if they contains spaces, quotes, and other
-special characters.
-
-Also add exports in the script just in case LD_LIBRARY_PATH and CC are
-not already in the environment.
-
-follow-up from 471dab2
-
-Closes #11182
---- a/configure.ac
-+++ b/configure.ac
-@@ -193,9 +193,13 @@ dnl something different but only have that affect the execution of the results
- dnl of the compile, not change the libraries for the compiler itself.
- dnl
- compilersh="run-compiler"
--echo "CC=\"$CC\"" > $compilersh
--echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh
--echo 'exec $CC $@' >> $compilersh
-+export "CURL_SAVED_CC=$CC"
-+export "CURL_SAVED_LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
-+cat <<\EOF > "$compilersh"
-+export "CC=$CURL_SAVED_CC"
-+export "LD_LIBRARY_PATH=$CURL_SAVED_LD_LIBRARY_PATH"
-+exec $CC "$@"
-+EOF
-
- dnl **********************************************************************
- dnl See which TLS backend(s) that are requested. Just do all the
-
diff --git a/net-misc/curl/files/curl-8.1.1-hanging-http2.patch b/net-misc/curl/files/curl-8.1.1-hanging-http2.patch
deleted file mode 100644
index 4777c4dd35ed..000000000000
--- a/net-misc/curl/files/curl-8.1.1-hanging-http2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/curl/curl/commit/5c58cb0212bcf63cce33a974906bf9905948b4bb
-From: Stefan Eissing <stefan@eissing.org>
-Date: Wed, 24 May 2023 18:48:16 +0200
-Subject: [PATCH] http2: fix EOF handling on uploads with auth negotiation
-
-- doing a POST with `--digest` does an override on the initial request
- with `Content-Length: 0`, but the http2 filter was unaware of that
- and expected the originally request body. It did therefore not
- send a final DATA frame with EOF flag to the server.
-- The fix overrides any initial notion of post size when the `done_send`
- event is triggered by the transfer loop, leading to the EOF that
- is necessary.
-- refs #11194. The fault did not happen in testing, as Apache httpd
- never tries to read the request body of the initial request,
- sends the 401 reply and closes the stream. The server used in the
- reported issue however tried to read the EOF and timed out on the
- request.
-
-Reported-by: Aleksander Mazur
-Fixes #11194
-Cloes #11200
---- a/lib/http2.c
-+++ b/lib/http2.c
-@@ -1527,10 +1527,8 @@ static CURLcode http2_data_done_send(struct Curl_cfilter *cf,
- if(!stream->send_closed) {
- stream->send_closed = TRUE;
- if(stream->upload_left) {
-- /* If we operated with unknown length, we now know that everything
-- * that is buffered is all we have to send. */
-- if(stream->upload_left == -1)
-- stream->upload_left = Curl_bufq_len(&stream->sendbuf);
-+ /* we now know that everything that is buffered is all there is. */
-+ stream->upload_left = Curl_bufq_len(&stream->sendbuf);
- /* resume sending here to trigger the callback to get called again so
- that it can signal EOF to nghttp2 */
- (void)nghttp2_session_resume_data(ctx->h2, stream->id);
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2023-08-14 5:58 Conrad Kostecki
0 siblings, 0 replies; 16+ messages in thread
From: Conrad Kostecki @ 2023-08-14 5:58 UTC (permalink / raw
To: gentoo-commits
commit: 36505d36317a892c0e6e863440f4d706bf066a43
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Aug 13 13:40:13 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 05:58:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36505d36
net-misc/curl: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32285
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-misc/curl/files/curl-8.2.0-basic-auth.patch | 127 ------------------------
net-misc/curl/files/curl-8.2.0-http2-eof.patch | 32 ------
2 files changed, 159 deletions(-)
diff --git a/net-misc/curl/files/curl-8.2.0-basic-auth.patch b/net-misc/curl/files/curl-8.2.0-basic-auth.patch
deleted file mode 100644
index 899ffb75a878..000000000000
--- a/net-misc/curl/files/curl-8.2.0-basic-auth.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-Patch-Source: https://github.com/curl/curl/pull/11492
---
-From 0470577eb4524f09d245e9e6afd42ba8677a5a19 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 20 Jul 2023 23:20:50 +0200
-Subject: [PATCH 1/2] test979: test -u with redirect to (the same) absolute
- host
-
----
- tests/data/Makefile.inc | 1 +
- tests/data/test979 | 64 +++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 65 insertions(+)
- create mode 100644 tests/data/test979
-
-diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
-index 8ee1394d4e562..12aefb14c0d1b 100644
---- a/tests/data/Makefile.inc
-+++ b/tests/data/Makefile.inc
-@@ -122,6 +122,7 @@ test943 test944 test945 test946 test947 test948 test949 test950 test951 \
- test952 test953 test954 test955 test956 test957 test958 test959 test960 \
- test961 test962 test963 test964 test965 test966 test967 test968 test969 \
- test970 test971 test972 test973 test974 test975 test976 test977 test978 \
-+test979 \
- \
- test980 test981 test982 test983 test984 test985 test986 test987 test988 \
- test989 \
-diff --git a/tests/data/test979 b/tests/data/test979
-new file mode 100644
-index 0000000000000..40cc35044d9f6
---- /dev/null
-+++ b/tests/data/test979
-@@ -0,0 +1,64 @@
-+<testcase>
-+<info>
-+<keywords>
-+HTTP
-+HTTP GET
-+Basic
-+</keywords>
-+</info>
-+
-+#
-+# Server-side
-+<reply>
-+<data crlf="yes" nocheck="yes">
-+HTTP/1.1 302 go go go
-+Content-Length: 8
-+Location: http://%HOSTIP:%HTTPPORT/user/%TESTNUMBER0002
-+Content-Type: text/html
-+Funny-head: yesyes
-+
-+notreal
-+</data>
-+<data2 crlf="yes">
-+HTTP/1.1 200 OK
-+Content-Length: 6
-+Content-Type: text/html
-+Funny-head: yesyes
-+
-+final
-+</data2>
-+</reply>
-+
-+#
-+# Client-side
-+<client>
-+<server>
-+http
-+</server>
-+<name>
-+-u with redirect to absolute URL using same origin and auth
-+</name>
-+<command>
-+http://first:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u smith:doggie
-+</command>
-+</client>
-+
-+#
-+# Verify data after the test has been "shot"
-+<verify>
-+<protocol crlf="yes">
-+GET /%TESTNUMBER HTTP/1.1
-+Host: %HOSTIP:%HTTPPORT
-+Authorization: Basic c21pdGg6ZG9nZ2ll
-+User-Agent: curl/%VERSION
-+Accept: */*
-+
-+GET /user/%TESTNUMBER0002 HTTP/1.1
-+Host: %HOSTIP:%HTTPPORT
-+Authorization: Basic c21pdGg6ZG9nZ2ll
-+User-Agent: curl/%VERSION
-+Accept: */*
-+
-+</protocol>
-+</verify>
-+</testcase>
-
-From c1effdfe658ae505e8ea65e5f46d810c4b8d81cb Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 20 Jul 2023 23:28:19 +0200
-Subject: [PATCH 2/2] transfer: do not clear the credentials on redirect to
- absolute URL
-
-Makes test 979 work. Regression shipped in 8.2.0 from commit
-dd4d1a26959f63a2c
-
-Fixes #11486
-Reported-by: Cloudogu Siebels
----
- lib/transfer.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/lib/transfer.c b/lib/transfer.c
-index 52cd6a0153673..b678004b95ad2 100644
---- a/lib/transfer.c
-+++ b/lib/transfer.c
-@@ -1558,10 +1558,6 @@ CURLcode Curl_follow(struct Curl_easy *data,
- /* If this is not redirect due to a 401 or 407 response and an absolute
- URL: don't allow a custom port number */
- disallowport = TRUE;
-- if(!data->set.allow_auth_to_other_hosts) {
-- Curl_safefree(data->state.aptr.user);
-- Curl_safefree(data->state.aptr.passwd);
-- }
- }
-
- DEBUGASSERT(data->state.uh);
diff --git a/net-misc/curl/files/curl-8.2.0-http2-eof.patch b/net-misc/curl/files/curl-8.2.0-http2-eof.patch
deleted file mode 100644
index 0040a3c6560e..000000000000
--- a/net-misc/curl/files/curl-8.2.0-http2-eof.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Patch-Source: https://github.com/curl/curl/commit/f9314f317f017e19e1802ce04ceeae620ca2cd71
---
-From: Stefan Eissing <stefan@eissing.org>
-Date: Thu, 20 Jul 2023 13:08:00 +0200
-Subject: [PATCH] http2: fix regression on upload EOF handling
-
-- a regression introduced by c9ec85121110d7cbbbed2990024222c8f5b8afe5
- where optimization of small POST bodies leads to a new code path
- for such uploads that did not trigger the "done sending" event
-- add triggering this event for early "upload_done" situations
-
-Fixes #11485
-Closes #11487
-Reported-by: Aleksander Mazur
----
- lib/http.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/http.c b/lib/http.c
-index f851bcd4a3443..e04028b3fec54 100644
---- a/lib/http.c
-+++ b/lib/http.c
-@@ -3380,6 +3380,9 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done)
- }
- }
-
-+ if(data->req.upload_done)
-+ Curl_conn_ev_data_done_send(data);
-+
- if((conn->httpversion >= 20) && data->req.upload_chunky)
- /* upload_chunky was set above to set up the request in a chunky fashion,
- but is disabled here again to avoid that the chunked encoded version is
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2023-10-15 22:04 Conrad Kostecki
0 siblings, 0 replies; 16+ messages in thread
From: Conrad Kostecki @ 2023-10-15 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 0da7d6b21bbbdd735fcaae1f27ddd01c6b8d0f3e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Oct 15 16:19:02 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 22:01:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da7d6b2
net-misc/curl: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33350
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../curl/files/curl-8.0.1-onion-resolution.patch | 158 ---------------------
1 file changed, 158 deletions(-)
diff --git a/net-misc/curl/files/curl-8.0.1-onion-resolution.patch b/net-misc/curl/files/curl-8.0.1-onion-resolution.patch
deleted file mode 100644
index 65b486529c1f..000000000000
--- a/net-misc/curl/files/curl-8.0.1-onion-resolution.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-https://bugs.gentoo.org/887287
-https://github.com/curl/curl/pull/10705
-
-From e2bbd1adc22ec5033e2292b780e1790db93c3cb4 Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Wed, 8 Mar 2023 02:16:45 +1100
-Subject: [PATCH] Refuse to resolve the .onion TLD.
-
-RFC 7686 states that:
-
-> Applications that do not implement the Tor
-> protocol SHOULD generate an error upon the use of .onion and
-> SHOULD NOT perform a DNS lookup.
-
-Let's do that.
-
-See curl/curl#543
-https://www.rfc-editor.org/rfc/rfc7686#section-2
---- a/docs/KNOWN_BUGS
-+++ b/docs/KNOWN_BUGS
-@@ -80,7 +80,6 @@ problems may have been fixed or changed somewhat since this was written.
- 10.3 FTPS over SOCKS
-
- 11. Internals
-- 11.1 Curl leaks .onion hostnames in DNS
- 11.2 error buffer not set if connection to multiple addresses fails
- 11.4 HTTP test server 'connection-monitor' problems
- 11.5 Connection information when using TCP Fast Open
-@@ -525,14 +524,6 @@ problems may have been fixed or changed somewhat since this was written.
-
- 11. Internals
-
--11.1 Curl leaks .onion hostnames in DNS
--
-- Curl sends DNS requests for hostnames with a .onion TLD. This leaks
-- information about what the user is attempting to access, and violates this
-- requirement of RFC7686: https://datatracker.ietf.org/doc/html/rfc7686
--
-- Issue: https://github.com/curl/curl/issues/543
--
- 11.2 error buffer not set if connection to multiple addresses fails
-
- If you ask libcurl to resolve a hostname like example.com to IPv6 addresses
---- a/lib/hostip.c
-+++ b/lib/hostip.c
-@@ -652,6 +652,14 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
- CURLcode result;
- enum resolve_t rc = CURLRESOLV_ERROR; /* default to failure */
- struct connectdata *conn = data->conn;
-+ /* We should intentionally error and not resolve .onion TLDs */
-+ size_t hostname_len = strlen(hostname);
-+ if(hostname_len >= 7 &&
-+ (curl_strequal(&hostname[hostname_len-6], ".onion") ||
-+ curl_strequal(&hostname[hostname_len-7], ".onion."))) {
-+ failf(data, "Not resolving .onion address (RFC 7686)");
-+ return CURLRESOLV_ERROR;
-+ }
- *entry = NULL;
- #ifndef CURL_DISABLE_DOH
- conn->bits.doh = FALSE; /* default is not */
---- a/tests/data/Makefile.inc
-+++ b/tests/data/Makefile.inc
-@@ -186,8 +186,8 @@ test1432 test1433 test1434 test1435 test1436 test1437 test1438 test1439 \
- test1440 test1441 test1442 test1443 test1444 test1445 test1446 test1447 \
- test1448 test1449 test1450 test1451 test1452 test1453 test1454 test1455 \
- test1456 test1457 test1458 test1459 test1460 test1461 test1462 test1463 \
--test1464 test1465 test1466 test1467 test1468 test1469 test1470 \
--\
-+test1464 test1465 test1466 test1467 test1468 test1469 test1470 test1471 \
-+test1472 \
- test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \
- test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \
- test1516 test1517 test1518 test1519 test1520 test1521 test1522 test1523 \
---- /dev/null
-+++ b/tests/data/test1471
-@@ -0,0 +1,39 @@
-+<testcase>
-+<info>
-+<keywords>
-+Onion
-+Tor
-+FAILURE
-+</keywords>
-+</info>
-+#
-+# Server-side
-+<reply>
-+</reply>
-+
-+#
-+# Client-side
-+<client>
-+<server>
-+none
-+</server>
-+<name>
-+Fail to resolve .onion TLD
-+</name>
-+<command>
-+red.onion
-+</command>
-+</client>
-+
-+#
-+# Verify data after the test has been "shot"
-+<verify>
-+# Couldn't resolve host name
-+<errorcode>
-+6
-+</errorcode>
-+<stderr mode="text">
-+curl: (6) Not resolving .onion address (RFC 7686)
-+</stderr>
-+</verify>
-+</testcase>
---- /dev/null
-+++ b/tests/data/test1472
-@@ -0,0 +1,39 @@
-+<testcase>
-+<info>
-+<keywords>
-+Onion
-+Tor
-+FAILURE
-+</keywords>
-+</info>
-+#
-+# Server-side
-+<reply>
-+</reply>
-+
-+#
-+# Client-side
-+<client>
-+<server>
-+none
-+</server>
-+<name>
-+Fail to resolve .onion. TLD
-+</name>
-+<command>
-+tasty.onion.
-+</command>
-+</client>
-+
-+#
-+# Verify data after the test has been "shot"
-+<verify>
-+# Couldn't resolve host name
-+<errorcode>
-+6
-+</errorcode>
-+<stderr mode="text">
-+curl: (6) Not resolving .onion address (RFC 7686)
-+</stderr>
-+</verify>
-+</testcase>
-
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/
@ 2024-10-04 8:27 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2024-10-04 8:27 UTC (permalink / raw
To: gentoo-commits
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 <stefan@eissing.org>
-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) {
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2024-10-04 8:28 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-14 5:58 [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2024-10-04 8:27 Sam James
2023-10-15 22:04 Conrad Kostecki
2023-06-10 9:16 Sam James
2023-03-23 8:59 Sam James
2023-02-22 10:00 Sam James
2023-02-17 5:14 Sam James
2023-01-01 18:16 Conrad Kostecki
2022-07-09 15:14 Anthony G. Basile
2021-11-17 21:24 Anthony G. Basile
2021-09-18 4:22 Sam James
2021-06-08 16:00 Anthony G. Basile
2018-07-14 19:06 Anthony G. Basile
2018-01-13 22:41 David Seifert
2017-08-09 12:18 Anthony G. Basile
2017-02-01 14:45 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox