From cfa735c40a46b19c787f540606495881452384d1 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 27 May 2026 23:50:45 +0200 Subject: [PATCH] h3-proxy: rename feature 'Proxy/PROXY-HTTP3' to 'proxy-HTTP3' For consistency and to follow existing 'HTTPS-proxy' (with lowercase 'proxy') feature tag more closely. Follow-up to e78b1b3eccfa6a2e367a1225ea1b66dafcdac3c4 #21153 Closes #21796 --- CMakeLists.txt | 2 +- configure.ac | 6 +++--- docs/libcurl/curl_version_info.md | 2 +- lib/version.c | 2 +- tests/http/test_60_h3_proxy.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1bce76dd8..362cc8ab90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2062,7 +2062,7 @@ curl_add_if("NTLM" CURL_ENABLE_NTLM AND curl_add_if("TLS-SRP" USE_TLS_SRP) curl_add_if("HTTP2" USE_NGHTTP2) curl_add_if("HTTP3" USE_NGTCP2 OR USE_QUICHE) -curl_add_if("PROXY-HTTP3" USE_PROXY_HTTP3) +curl_add_if("proxy-HTTP3" USE_PROXY_HTTP3) curl_add_if("MultiSSL" CURL_WITH_MULTI_SSL) curl_add_if("HTTPS-proxy" NOT CURL_DISABLE_PROXY AND _ssl_enabled AND (USE_OPENSSL OR USE_GNUTLS OR USE_SCHANNEL OR USE_RUSTLS OR USE_MBEDTLS OR diff --git a/configure.ac b/configure.ac index bb9390e0a1..20b4a9d91b 100644 --- a/configure.ac +++ b/configure.ac @@ -5086,7 +5086,7 @@ if test "$want_proxy_http3" = "yes"; then AC_DEFINE(USE_PROXY_HTTP3, 1, [if HTTP/3 proxy support is available]) USE_PROXY_HTTP3=1 AC_MSG_RESULT([yes]) - experimental="$experimental PROXY-HTTP3" + experimental="$experimental proxy-HTTP3" fi fi @@ -5204,7 +5204,7 @@ if test "$curl_psl_msg" = "enabled"; then fi if test "$USE_PROXY_HTTP3" = "1"; then - SUPPORT_FEATURES="$SUPPORT_FEATURES PROXY-HTTP3" + SUPPORT_FEATURES="$SUPPORT_FEATURES proxy-HTTP3" fi if test "$curl_gsasl_msg" = "enabled"; then @@ -5551,7 +5551,7 @@ AC_MSG_NOTICE([Configured to build curl/libcurl: HTTP1: ${curl_h1_msg} HTTP2: ${curl_h2_msg} HTTP3: ${curl_h3_msg} - Proxy-HTTP3: ${curl_proxy_http3_msg} + proxy-HTTP3: ${curl_proxy_http3_msg} ECH: ${curl_ech_msg} HTTPS RR: ${curl_httpsrr_msg} SSLS-EXPORT: ${curl_ssls_export_msg} diff --git a/docs/libcurl/curl_version_info.md b/docs/libcurl/curl_version_info.md index ec29fa66e7..5b18222169 100644 --- a/docs/libcurl/curl_version_info.md +++ b/docs/libcurl/curl_version_info.md @@ -298,7 +298,7 @@ supports HTTP NTLM libcurl was built with support for NTLM delegation to a winbind helper. This feature was removed from curl in 8.8.0. -## `PROXY-HTTP3` +## `proxy-HTTP3` *features* mask bit: non-existent diff --git a/lib/version.c b/lib/version.c index d5870333ab..6522f0951e 100644 --- a/lib/version.c +++ b/lib/version.c @@ -492,7 +492,7 @@ static const struct feat features_table[] = { FEATURE("NTLM", NULL, CURL_VERSION_NTLM), #endif #ifdef USE_PROXY_HTTP3 - FEATURE("PROXY-HTTP3", NULL, 0), + FEATURE("proxy-HTTP3", NULL, 0), #endif #ifdef USE_LIBPSL FEATURE("PSL", NULL, CURL_VERSION_PSL), diff --git a/tests/http/test_60_h3_proxy.py b/tests/http/test_60_h3_proxy.py index 786c6e7bf2..ca4501f635 100644 --- a/tests/http/test_60_h3_proxy.py +++ b/tests/http/test_60_h3_proxy.py @@ -39,7 +39,7 @@ MARK_NEEDS_HTTP3 = pytest.mark.skipif( condition=not Env.curl_has_feature("HTTP3"), reason="curl lacks HTTP/3 support" ) MARK_NEEDS_PROXY_HTTP3 = pytest.mark.skipif( - condition=not Env.curl_has_feature("PROXY-HTTP3"), + condition=not Env.curl_has_feature("proxy-HTTP3"), reason="curl lacks experimental HTTP/3 proxy support" ) MARK_NEEDS_NGHTTP3 = pytest.mark.skipif( @@ -340,7 +340,7 @@ class TestH3ProxyRuntimeGuards: r = curl.http_download( urls=[url], alpn_proto="http/1.1", with_stats=True, extra_args=proxy_args ) - if not env.curl_has_feature("PROXY-HTTP3"): + if not env.curl_has_feature("proxy-HTTP3"): r.check_exit_code(2) assert UNSUPPORTED_OPT_MSG in r.stderr.lower(), ( f"Expected unsupported option failure but got: {r.stderr}"