From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 26 Jan 2025 11:23:33 +0000 (+0100)
Subject: version: rename c-ares-rr to asyn-rr
X-Git-Tag: curl-8_12_0~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e27abfe2f1fcde7e685bfa789398ab1360cf090e;p=thirdparty%2Fcurl.git

version: rename c-ares-rr to asyn-rr

Works better if we later introduce another way to do the asynch RR
resolves (together with the threaded resolver) that does not use c-ares.

Closes #16090
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1987cb1ac8..70d9426d47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2107,7 +2107,7 @@ curl_add_if("brotli"        HAVE_BROTLI)
 curl_add_if("gsasl"         USE_GSASL)
 curl_add_if("zstd"          HAVE_ZSTD)
 curl_add_if("AsynchDNS"     USE_ARES OR USE_THREADS_POSIX OR USE_THREADS_WIN32)
-curl_add_if("c-ares-rr"     USE_ARES AND ENABLE_THREADED_RESOLVER)
+curl_add_if("asyn-rr"       USE_ARES AND ENABLE_THREADED_RESOLVER)
 curl_add_if("IDN"           (HAVE_LIBIDN2 AND HAVE_IDN2_H) OR
                             USE_WIN32_IDN OR
                             USE_APPLE_IDN)
diff --git a/configure.ac b/configure.ac
index a67dc76064..5f7014fca8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5018,7 +5018,7 @@ if test "x$USE_ARES" = "x1" -o "x$USE_THREADS_POSIX" = "x1" \
   SUPPORT_FEATURES="$SUPPORT_FEATURES AsynchDNS"
 fi
 if test "x$USE_ARES" = "x1" -a "$want_threaded_resolver" = "yes"; then
-  SUPPORT_FEATURES="$SUPPORT_FEATURES c-ares-rr"
+  SUPPORT_FEATURES="$SUPPORT_FEATURES asyn-rr"
 fi
 if test "x$IDN_ENABLED" = "x1"; then
   SUPPORT_FEATURES="$SUPPORT_FEATURES IDN"
diff --git a/docs/HTTPSRR.md b/docs/HTTPSRR.md
index bd40d4e000..9f653e622f 100644
--- a/docs/HTTPSRR.md
+++ b/docs/HTTPSRR.md
@@ -25,9 +25,9 @@ curl features **experimental** support for HTTPS RR.
 HTTPS RR support. If c-ares is not included in the build, the HTTPS RR support
 is limited to DoH.
 
-`c-ares-rr` is listed as a feature in the `curl -V` output if c-ares is used
-for additional resolves in addition to a "normal" resolve done with the
-threaded resolver.
+`asyn-rr` is listed as a feature in the `curl -V` output if c-ares is used for
+additional resolves in addition to a "normal" resolve done with the threaded
+resolver.
 
 The data extracted from the HTTPS RR is stored in the in-memory DNS cache to
 be reused on subsequent uses of the same hostnames.
diff --git a/docs/libcurl/curl_version_info.md b/docs/libcurl/curl_version_info.md
index ed22a54df9..3b8dec75f3 100644
--- a/docs/libcurl/curl_version_info.md
+++ b/docs/libcurl/curl_version_info.md
@@ -171,7 +171,7 @@ interface. (added in 7.10.7)
 
 supports HTTP Brotli content encoding using libbrotlidec (Added in 7.57.0)
 
-## `c-ares-rr`
+## `asyn-rr`
 
 *features* mask bit: non-existent
 
diff --git a/lib/version.c b/lib/version.c
index 0fcfed0379..f32969ebe5 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -461,15 +461,15 @@ static const struct feat features_table[] = {
 #ifndef CURL_DISABLE_ALTSVC
   FEATURE("alt-svc",     NULL,                CURL_VERSION_ALTSVC),
 #endif
+#if defined(USE_ARES) && defined(CURLRES_THREADED) && defined(USE_HTTPSRR)
+  FEATURE("asyn-rr", NULL,             0),
+#endif
 #ifdef CURLRES_ASYNCH
   FEATURE("AsynchDNS",   NULL,                CURL_VERSION_ASYNCHDNS),
 #endif
 #ifdef HAVE_BROTLI
   FEATURE("brotli",      NULL,                CURL_VERSION_BROTLI),
 #endif
-#if defined(CURLRES_ARES) && defined(CURLRES_THREADED)
-  FEATURE("c-ares-rr", NULL,             0),
-#endif
 #ifdef DEBUGBUILD
   FEATURE("Debug",       NULL,                CURL_VERSION_DEBUG),
 #endif
diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md
index 5b5f82dea4..c408999249 100644
--- a/tests/FILEFORMAT.md
+++ b/tests/FILEFORMAT.md
@@ -436,10 +436,10 @@ Features testable here are:
 
 - `alt-svc`
 - `AppleIDN`
+- `asyn-rr` - c-ares is used for additional records only
 - `bearssl`
 - `brotli`
 - `c-ares` - c-ares is used for (all) name resolves
-- `c-ares-rr` - c-ares is used for additional records only
 - `CharConv`
 - `codeset-utf8`. If the running codeset is UTF-8 capable.
 - `cookies`
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 9ec2b8ca45..da9caebfc2 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -699,7 +699,7 @@ sub checksystemfeatures {
             # Thread-safe init
             $feature{"threadsafe"} = $feat =~ /threadsafe/i;
             $feature{"HTTPSRR"} = $feat =~ /HTTPSRR/;
-            $feature{"c-ares-rr"} = $feat =~ /c-ares-rr/;
+            $feature{"asyn-rr"} = $feat =~ /asyn-rr/;
         }
         #
         # Test harness currently uses a non-stunnel server in order to