From 12532713d654d265bb7cb1c0c62e8a942d3a64d5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 25 Jul 2026 16:58:54 +0200 Subject: [PATCH] build: tidy up httpsig options - say 'experimental'. - cmake: add to documentation. - cmake: alpha-sort. Follow-up to a55731050e8c3dbea0b96205cf916443118f6acb #22386 Closes #22391 --- CMakeLists.txt | 4 ++-- configure.ac | 4 ++-- docs/INSTALL-CMAKE.md | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f36b49034e..663ca54081 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -435,8 +435,6 @@ option(CURL_DISABLE_NEGOTIATE_AUTH "Disable negotiate authentication" OFF) mark_as_advanced(CURL_DISABLE_NEGOTIATE_AUTH) option(CURL_DISABLE_AWS "Disable aws-sigv4" OFF) mark_as_advanced(CURL_DISABLE_AWS) -option(CURL_DISABLE_HTTPSIG "Disable HTTP Message Signatures (RFC 9421)" ON) -mark_as_advanced(CURL_DISABLE_HTTPSIG) option(CURL_DISABLE_DICT "Disable DICT" OFF) mark_as_advanced(CURL_DISABLE_DICT) option(CURL_DISABLE_DOH "Disable DNS-over-HTTPS" OFF) @@ -457,6 +455,8 @@ option(CURL_DISABLE_HTTP "Disable HTTP" OFF) mark_as_advanced(CURL_DISABLE_HTTP) option(CURL_DISABLE_HTTP_AUTH "Disable all HTTP authentication methods" OFF) mark_as_advanced(CURL_DISABLE_HTTP_AUTH) +option(CURL_DISABLE_HTTPSIG "Disable HTTP Message Signatures (RFC 9421) (experimental)" ON) +mark_as_advanced(CURL_DISABLE_HTTPSIG) option(CURL_DISABLE_IMAP "Disable IMAP" OFF) mark_as_advanced(CURL_DISABLE_IMAP) option(CURL_DISABLE_LDAP "Disable LDAP" OFF) diff --git a/configure.ac b/configure.ac index eed980f0eb..0d2ee2b3ff 100644 --- a/configure.ac +++ b/configure.ac @@ -4571,8 +4571,8 @@ dnl disable httpsig (RFC 9421) dnl AC_MSG_CHECKING([whether to enable HTTP Message Signatures (RFC 9421)]) AC_ARG_ENABLE(httpsig, -AS_HELP_STRING([--enable-httpsig],[Enable HTTP Message Signatures support]) -AS_HELP_STRING([--disable-httpsig],[Disable HTTP Message Signatures support (default)]), +AS_HELP_STRING([--enable-httpsig],[Enable HTTP Message Signatures support (experimental)]) +AS_HELP_STRING([--disable-httpsig],[Disable HTTP Message Signatures support (experimental) (default)]), [ case "$enableval" in no) AC_MSG_RESULT(no) diff --git a/docs/INSTALL-CMAKE.md b/docs/INSTALL-CMAKE.md index c95ce3366b..59b8c9ecac 100644 --- a/docs/INSTALL-CMAKE.md +++ b/docs/INSTALL-CMAKE.md @@ -278,6 +278,7 @@ target_link_libraries(my_target PRIVATE CURL::libcurl) - `CURL_DISABLE_HSTS`: Disable HSTS support. Default: `OFF` - `CURL_DISABLE_HTTP`: Disable HTTP. Default: `OFF` - `CURL_DISABLE_HTTP_AUTH`: Disable all HTTP authentication methods. Default: `OFF` +- `CURL_DISABLE_HTTPSIG`: Disable HTTP Message Signatures (RFC 9421) (experimental). Default: `ON` - `CURL_DISABLE_IMAP`: Disable IMAP. Default: `OFF` - `CURL_DISABLE_INSTALL`: Disable installation targets. Default: `OFF` - `CURL_DISABLE_IPFS`: Disable IPFS. Default: `OFF`