← Commit list

789282cb8d

Daniel Stenberg

2026-03-21

SUCCESS Duration: 251s

Subject

lib: drop support for < c-ares 1.16.0

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

.github/workflows/linux-old.yml +18 -15 docs/INTERNALS.md +1 -1 lib/asyn-ares.c +5 -228 lib/asyn-base.c +2 -3 lib/asyn.h +0 -2 m4/curl-confopts.m4 +4 -21

.github/workflows/linux-old.yml+18 -15

@@ -69,7 +69,7 @@ jobs:
	sha256sum freexian-archive-keyring_2022.06.08_all.deb && dpkg -i freexian-archive-keyring_2022.06.08_all.deb
	echo 'deb http://deb.freexian.com/extended-lts stretch-lts main contrib non-free' \| tee /etc/apt/sources.list.d/extended-lts.list
	apt-get -o Dpkg::Use-Pty=0 update
-	apt-get -o Dpkg::Use-Pty=0 install -y --no-install-suggests --no-install-recommends make automake autoconf libtool ninja-build gcc pkg-config libpsl-dev libzstd-dev zlib1g-dev libc-ares-dev libkrb5-dev libldap2-dev stunnel4
+	apt-get -o Dpkg::Use-Pty=0 install -y --no-install-suggests --no-install-recommends make automake autoconf libtool ninja-build gcc pkg-config libpsl-dev libzstd-dev zlib1g-dev libkrb5-dev libldap2-dev stunnel4
	# GitHub's actions/checkout needs newer glibc and libstdc++. The latter also depends on
	# gcc-8-base, but it does not actually seem used in our situation and is not available in
	# the main repo, so force the install.
@@ -116,49 +116,52 @@ jobs:

	# when this job can get a libssh version 0.9.0 or later, this should get
	# that enabled again
-	- name: 'CM configure (out-of-tree, c-ares, zstd, gssapi)'
+	# when this job can get c-ares 1.16.0 or later, we can enable that
+	# again
+
+	- name: 'CM configure (out-of-tree, zstd, gssapi)'
	run: \|
-	~/cmake/bin/cmake -B bld-cares -G Ninja -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
-	-DCURL_ENABLE_SSL=OFF -DENABLE_ARES=ON -DCURL_USE_GSSAPI=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=OFF \
+	~/cmake/bin/cmake -B bld-oldie -G Ninja -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
+	-DCURL_ENABLE_SSL=OFF -DENABLE_ARES=OFF -DCURL_USE_GSSAPI=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=OFF \
	-DCURL_LIBCURL_VERSIONED_SYMBOLS=ON

	- name: 'CM configure log'
	if: ${{ !cancelled() }}
-	run: cat bld-cares/CMakeFiles/CMake*.log 2>/dev/null \|\| true
+	run: cat bld-oldie/CMakeFiles/CMake*.log 2>/dev/null \|\| true

	- name: 'CM curl_config.h'
	run: \|
-	echo '::group::raw'; cat bld-cares/lib/curl_config.h \|\| true; echo '::endgroup::'
-	grep -F '#define' bld-cares/lib/curl_config.h \| sort \|\| true
+	echo '::group::raw'; cat bld-oldie/lib/curl_config.h \|\| true; echo '::endgroup::'
+	grep -F '#define' bld-oldie/lib/curl_config.h \| sort \|\| true

	- name: 'CM build'
-	run: ~/cmake/bin/cmake --build bld-cares
+	run: ~/cmake/bin/cmake --build bld-oldie

	- name: 'CM curl -V'
-	run: bld-cares/src/curl --disable --version
+	run: bld-oldie/src/curl --disable --version

	- name: 'CM install'
-	run: ~/cmake/bin/cmake --install bld-cares
+	run: ~/cmake/bin/cmake --install bld-oldie

	- name: 'CM build tests'
-	run: ~/cmake/bin/cmake --build bld-cares --target testdeps
+	run: ~/cmake/bin/cmake --build bld-oldie --target testdeps

	- name: 'CM run tests'
-	run: ~/cmake/bin/cmake --build bld-cares --target test-ci
+	run: ~/cmake/bin/cmake --build bld-oldie --target test-ci

	- name: 'CM build examples'
-	run: ~/cmake/bin/cmake --build bld-cares --target curl-examples-build
+	run: ~/cmake/bin/cmake --build bld-oldie --target curl-examples-build

	- name: 'AM autoreconf'
	run: autoreconf -fi

-	- name: 'AM configure (out-of-tree, c-ares, zstd, gssapi)'
+	- name: 'AM configure (out-of-tree, zstd, gssapi)'
	run: \|
	mkdir bld-am
	cd bld-am
	../configure --prefix="$PWD"/../curl-install-am --enable-unity --enable-warnings --enable-werror --disable-shared \
	--disable-dependency-tracking --enable-option-checking=fatal \
-	--without-ssl --enable-ares --without-libssh2 --with-zstd --with-gssapi
+	--without-ssl --disable-ares --without-libssh2 --with-zstd --with-gssapi

	- name: 'AM configure log'
	if: ${{ !cancelled() }}

docs/INTERNALS.md+1 -1

@@ -27,7 +27,7 @@ want it to remain functional and buildable with these and later versions
	We aim to support these or later versions.

	- brotli 1.0.0 (2017-09-21)
-	- c-ares 1.6.0 (2008-12-09)
+	- c-ares 1.16.0 (2020-03-13)
	- GnuTLS 3.6.5 (2018-12-01)
	- libidn2 2.0.0 (2017-03-29)
	- LibreSSL 2.9.1 (2019-04-22)

lib/asyn-ares.c+5 -228

@@ -58,35 +58,10 @@
	#include "progress.h"
	#include "curlx/timediff.h"
	#include "httpsrr.h"
-
	#include <ares.h>
-	#include <ares_version.h> /* really old c-ares did not include this by
-	itself */
-
-	#if ARES_VERSION >= 0x010704
-	#define HAVE_CARES_SERVERS_CSV 1
-	#define HAVE_CARES_LOCAL_DEV 1
-	#define HAVE_CARES_SET_LOCAL 1
-	#endif
-
-	#if ARES_VERSION >= 0x010b00
-	#define HAVE_CARES_PORTS_CSV 1
-	#endif

-	#if ARES_VERSION >= 0x011000
-	/* 1.16.0 or later has ares_getaddrinfo */
-	#define HAVE_CARES_GETADDRINFO 1
-	#else
-	/* How long we are willing to wait for additional parallel responses after
-	obtaining a "definitive" one. For old c-ares without getaddrinfo.
-
-	This is intended to equal the c-ares default timeout. curl always uses that
-	default value. Unfortunately, c-ares does not expose its default timeout in
-	its API, but it is officially documented as 5 seconds.
-
-	See query_completed_cb() for an explanation of how this is used.
-	*/
-	#define HAPPY_EYEBALLS_DNS_TIMEOUT 5000
+	#if ARES_VERSION < 0x011000
+	#error "requires c-ares 1.16.0 or newer"
	#endif

	#ifdef USE_HTTPSRR
@@ -301,31 +276,6 @@ CURLcode Curl_async_take_result(struct Curl_easy *data,
	goto out;
	}

-	#ifndef HAVE_CARES_GETADDRINFO
-	/* Now that we have checked for any last minute results above, see if there
-	are any responses still pending when the EXPIRE_HAPPY_EYEBALLS_DNS timer
-	expires. */
-	if(ares->num_pending &&
-	/* This is only set to non-zero if the timer was started. */
-	(ares->happy_eyeballs_dns_time.tv_sec \|\|
-	ares->happy_eyeballs_dns_time.tv_usec) &&
-	(curlx_ptimediff_ms(Curl_pgrs_now(data),
-	&ares->happy_eyeballs_dns_time) >=
-	HAPPY_EYEBALLS_DNS_TIMEOUT)) {
-	/* Remember that the EXPIRE_HAPPY_EYEBALLS_DNS timer is no longer
-	running. */
-	memset(&ares->happy_eyeballs_dns_time, 0,
-	sizeof(ares->happy_eyeballs_dns_time));
-
-	/* Cancel the raw c-ares request, which will fire query_completed_cb() with
-	ARES_ECANCELLED synchronously for all pending responses. This will
-	leave us with res->num_pending == 0, which is perfect for the next
-	block. */
-	ares_cancel(ares->channel);
-	DEBUGASSERT(ares->num_pending == 0);
-	}
-	#endif
-
	if(!ares->num_pending) {
	/* all c-ares operations done, what is the result to report? */
	result = ares->result;
@@ -462,134 +412,6 @@ CURLcode Curl_async_await(struct Curl_easy *data,
	return result;
	}

-	#ifndef HAVE_CARES_GETADDRINFO
-
-	/* Connects results to the list */
-	static void async_addr_concat(struct Curl_addrinfo **pbase,
-	struct Curl_addrinfo *ai)
-	{
-	if(!ai)
-	return;
-
-	/* When adding `ai` to an existing address list, we prefer ipv6
-	* to be in front. */
-	#ifdef USE_IPV6 /* CURLRES_IPV6 */
-	if(pbase && (pbase)->ai_family == PF_INET6) {
-	/* ipv6 already in front, append `ai` */
-	struct Curl_addrinfo tail = pbase;
-	while(tail->ai_next)
-	tail = tail->ai_next;
-	tail->ai_next = ai;
-	}
-	else
-	#endif /* CURLRES_IPV6 */
-	{
-	/* prepend to the (possibly) existing list. */
-	struct Curl_addrinfo *tail = ai;
-	while(tail->ai_next)
-	tail = tail->ai_next;
-	tail->ai_next = *pbase;
-	*pbase = ai;
-	}
-	}
-
-	/*
-	* ares_query_completed_cb() is the callback that ares will call when
-	* the host query initiated by ares_gethostbyname() from
-	* Curl_async_getaddrinfo(), when using ares, is completed either
-	* successfully or with failure.
-	*/
-	static void async_ares_hostbyname_cb(void *user_data,
-	int status,
-	int timeouts,
-	struct hostent *hostent)
-	{
-	struct Curl_easy data = (struct Curl_easy )user_data;
-	struct Curl_resolv_async *async = data->state.async;
-	struct async_ares_ctx *ares = async ? &async->ares : NULL;
-
-	(void)timeouts; /* ignored */
-	if(!ares)
-	return;
-
-	if(ARES_EDESTRUCTION == status)
-	return;
-
-	if(ARES_SUCCESS == status) {
-	ares->ares_status = status; /* one success overrules any error */
-	async_addr_concat(&ares->temp_ai, Curl_he2ai(hostent, async->port));
-	}
-	else if(ares->ares_status != ARES_SUCCESS) {
-	/* no success so far, remember last error */
-	ares->ares_status = status;
-	}
-
-	ares->num_pending--;
-
-	CURL_TRC_DNS(data, "ares: hostbyname done, status=%d, pending=%d, "
-	"addr=%sfound",
-	status, ares->num_pending, ares->temp_ai ? "" : "not ");
-	/* If there are responses still pending, we presume they must be the
-	complementary IPv4 or IPv6 lookups that we started in parallel in
-	Curl_async_getaddrinfo() (for Happy Eyeballs). If we have got a
-	"definitive" response from one of a set of parallel queries, we need to
-	think about how long we are willing to wait for more responses. */
-	if(ares->num_pending
-	/* Only these c-ares status values count as "definitive" for these
-	purposes. For example, ARES_ENODATA is what we expect when there is
-	no IPv6 entry for a domain name, and that is not a reason to get more
-	aggressive in our timeouts for the other response. Other errors are
-	either a result of bad input (which should affect all parallel
-	requests), local or network conditions, non-definitive server
-	responses, or us cancelling the request. */
-	&& (status == ARES_SUCCESS \|\| status == ARES_ENOTFOUND)) {
-	/* Right now, there can only be up to two parallel queries, so do not
-	bother handling any other cases. */
-	DEBUGASSERT(ares->num_pending == 1);
-
-	/* it is possible that one of these parallel queries could succeed
-	quickly, but the other could always fail or timeout (when we are
-	talking to a pool of DNS servers that can only successfully resolve
-	IPv4 address, for example).
-
-	it is also possible that the other request could always take longer
-	because it needs more time or only the second DNS server can fulfill it
-	successfully. Yet, to align with the philosophy of Happy Eyeballs, we
-	do not want to wait _too_ long or users will think requests are slow
-	when IPv6 lookups do not actually work (but IPv4 ones do).
-
-	Now that we have a usable answer (some IPv4 addresses, some IPv6
-	addresses, or "no such domain"), we start a timeout for the remaining
-	pending responses. Even though it is typical that this resolved
-	request came back quickly, that need not be the case. It might be that
-	this completing request did not get a result from the first DNS
-	server or even the first round of the whole DNS server pool. This
-	could already be a long time after we issued the DNS queries in
-	the first place. Without modifying c-ares, we cannot know exactly
-	where in its retry cycle we are. We could guess based on how much
-	time has gone by, but it does not really matter. Happy Eyeballs tells
-	us that, given usable information in hand, we do not want to
-	wait "too much longer" after we get a result.
-
-	We wait an additional amount of time equal to the default c-ares
-	query timeout. That is enough time for a typical parallel response to
-	arrive without being "too long". Even on a network where one of the two
-	types of queries is failing or timing out constantly, this will usually
-	mean we wait a total of the default c-ares timeout (5 seconds) plus the
-	round trip time for the successful request, which seems bearable. The
-	downside is that c-ares might race with us to issue one more retry
-	before we give up, but it seems better to "waste" that request instead
-	of trying to guess the perfect timeout to prevent it. After all, we do
-	not even know where in the c-ares retry cycle each request is.
-	*/
-	ares->happy_eyeballs_dns_time = *Curl_pgrs_now(data);
-	Curl_expire(data, HAPPY_EYEBALLS_DNS_TIMEOUT, EXPIRE_HAPPY_EYEBALLS_DNS);
-	}
-	}
-
-	#else
-	/* c-ares 1.16.0 or later */
-
	/*
	* async_ares_node2addr() converts an address list provided by c-ares
	* to an internal libcurl compatible list.
@@ -688,8 +510,6 @@ static void async_ares_addrinfo_cb(void *user_data, int status, int timeouts,
	ares->temp_ai ? "" : "not ");
	}

-	#endif
-
	#ifdef USE_HTTPSRR
	static void async_ares_rr_done(void *user_data, ares_status_t status,
	size_t timeouts,
@@ -751,7 +571,6 @@ CURLcode Curl_async_getaddrinfo(struct Curl_easy *data,
	}
	#endif

-	#ifdef HAVE_CARES_GETADDRINFO
	{
	struct ares_addrinfo_hints hints;
	char service[12];
@@ -782,30 +601,7 @@ CURLcode Curl_async_getaddrinfo(struct Curl_easy *data,
	ares_getaddrinfo(ares->channel, async->hostname,
	service, &hints, async_ares_addrinfo_cb, data);
	}
-	#else

-	#if ARES_VERSION >= 0x010601 /* IPv6 supported since 1.6.1 */
-	if((async->ip_version != CURL_IPRESOLVE_V4) && Curl_ipv6works(data)) {
-	/* The stack seems to be IPv6-enabled */
-	/* areschannel is already setup in the Curl_open() function */
-	CURL_TRC_DNS(data, "asyn-ares: fire off query for A");
-	ares_gethostbyname(ares->channel, async->hostname, PF_INET,
-	async_ares_hostbyname_cb, data);
-	CURL_TRC_DNS(data, "asyn-ares: fire off query for AAAA");
-	ares->num_pending = 2;
-	ares_gethostbyname(ares->channel, async->hostname, PF_INET6,
-	async_ares_hostbyname_cb, data);
-	}
-	else
-	#endif
-	{
-	/* areschannel is already setup in the Curl_open() function */
-	CURL_TRC_DNS(data, "asyn-ares: fire off query for A");
-	ares->num_pending = 1;
-	ares_gethostbyname(ares->channel, async->hostname, PF_INET,
-	async_ares_hostbyname_cb, data);
-	}
-	#endif
	#ifdef USE_HTTPSRR
	{
	CURL_TRC_DNS(data, "asyn-ares: fire off query for HTTPSRR: %s",
@@ -839,7 +635,7 @@ static CURLcode async_ares_set_dns_servers(struct Curl_easy *data,
	const char *servers = data->set.str[STRING_DNS_SERVERS];
	int ares_result = ARES_SUCCESS;

-	#if defined(DEBUGBUILD) && defined(HAVE_CARES_SERVERS_CSV)
+	#ifdef DEBUGBUILD
	if(getenv("CURL_DNS_SERVER"))
	servers = getenv("CURL_DNS_SERVER");
	#endif
@@ -851,14 +647,9 @@ static CURLcode async_ares_set_dns_servers(struct Curl_easy *data,
	return CURLE_OK;
	}

-	#ifdef HAVE_CARES_SERVERS_CSV
	/* if channel is not there, this is a parameter check */
	if(ares && ares->channel)
-	#ifdef HAVE_CARES_PORTS_CSV
	ares_result = ares_set_servers_ports_csv(ares->channel, servers);
-	#else
-	ares_result = ares_set_servers_csv(ares->channel, servers);
-	#endif
	switch(ares_result) {
	case ARES_SUCCESS:
	result = CURLE_OK;
@@ -874,10 +665,6 @@ static CURLcode async_ares_set_dns_servers(struct Curl_easy *data,
	result = CURLE_BAD_FUNCTION_ARGUMENT;
	break;
	}
-	#else /* c-ares version too old! */
-	(void)data;
-	(void)(ares_result);
-	#endif
	return result;
	}

@@ -888,7 +675,6 @@ CURLcode Curl_async_ares_set_dns_servers(struct Curl_easy *data)

	CURLcode Curl_async_ares_set_dns_interface(struct Curl_easy *data)
	{
-	#ifdef HAVE_CARES_LOCAL_DEV
	struct Curl_resolv_async *async = data->state.async;
	struct async_ares_ctx *ares = async ? &async->ares : NULL;
	const char *interf = data->set.str[STRING_DNS_INTERFACE];
@@ -901,15 +687,10 @@ CURLcode Curl_async_ares_set_dns_interface(struct Curl_easy *data)
	ares_set_local_dev(ares->channel, interf);

	return CURLE_OK;
-	#else /* c-ares version too old! */
-	(void)data;
-	return CURLE_NOT_BUILT_IN;
-	#endif
	}

	CURLcode Curl_async_ares_set_dns_local_ip4(struct Curl_easy *data)
	{
-	#ifdef HAVE_CARES_SET_LOCAL
	struct Curl_resolv_async *async = data->state.async;
	struct async_ares_ctx *ares = async ? &async->ares : NULL;
	struct in_addr a4;
@@ -930,15 +711,11 @@ CURLcode Curl_async_ares_set_dns_local_ip4(struct Curl_easy *data)
	ares_set_local_ip4(ares->channel, ntohl(a4.s_addr));

	return CURLE_OK;
-	#else /* c-ares version too old! */
-	(void)data;
-	return CURLE_NOT_BUILT_IN;
-	#endif
	}

	CURLcode Curl_async_ares_set_dns_local_ip6(struct Curl_easy *data)
	{
-	#if defined(HAVE_CARES_SET_LOCAL) && defined(USE_IPV6)
+	#ifdef USE_IPV6
	struct Curl_resolv_async *async = data->state.async;
	struct async_ares_ctx *ares = async ? &async->ares : NULL;
	unsigned char a6[INET6_ADDRSTRLEN];
@@ -960,7 +737,7 @@ CURLcode Curl_async_ares_set_dns_local_ip6(struct Curl_easy *data)
	ares_set_local_ip6(ares->channel, a6);

	return CURLE_OK;
-	#else /* c-ares version too old! */
+	#else /* no IPv6 support */
	(void)data;
	return CURLE_NOT_BUILT_IN;
	#endif

lib/asyn-base.c+2 -3

@@ -39,7 +39,6 @@

	#ifdef USE_ARES
	#include <ares.h>
-	#include <ares_version.h> /* really old c-ares did not include it by itself */
	#endif

	#include "urldata.h"
@@ -56,8 +55,8 @@

	#ifdef USE_ARES

-	#if ARES_VERSION < 0x010600
-	#error "requires c-ares 1.6.0 or newer"
+	#if ARES_VERSION < 0x011000
+	#error "requires c-ares 1.16.0 or newer"
	#endif

	/*

lib/asyn.h+0 -2

@@ -143,9 +143,7 @@ struct async_ares_ctx {
	parts */
	int ares_status; /* ARES_SUCCESS, ARES_ENOTFOUND, etc. */
	CURLcode result; /* CURLE_OK or error handling response */
-	#ifndef HAVE_CARES_GETADDRINFO
	struct curltime happy_eyeballs_dns_time; /* when this timer started, or 0 */
-	#endif
	#ifdef USE_HTTPSRR
	struct Curl_https_rrinfo hinfo;
	#endif

m4/curl-confopts.m4+4 -21

@@ -442,28 +442,11 @@ AC_DEFUN([CURL_CHECK_LIB_ARES], [
	LIBS="$ares_LIBS $clean_LIBS"
	#

-	dnl check if c-ares new enough
-	AC_MSG_CHECKING([that c-ares is good and recent enough])
-	AC_LINK_IFELSE([
-	AC_LANG_PROGRAM([[
-	#include <ares.h>
-	/* set of dummy functions in case c-ares was built with debug */
-	void curl_dofree(void); void curl_dofree(void) {}
-	void curl_sclose(void); void curl_sclose(void) {}
-	void curl_domalloc(void); void curl_domalloc(void) {}
-	void curl_docalloc(void); void curl_docalloc(void) {}
-	void curl_socket(void); void curl_socket(void) {}
-	]],[[
-	ares_channel channel;
-	ares_cancel(channel); /* added in 1.2.0 */
-	ares_process_fd(channel, 0, 0); /* added in 1.4.0 */
-	ares_dup(&channel, channel); /* added in 1.6.0 */
-	]])
+	dnl check if c-ares new enough, 1.16.0 or newer
+	AC_CHECK_FUNC([ares_getaddrinfo],
+	[
	],[
-	AC_MSG_RESULT([yes])
-	],[
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([c-ares library defective or too old])
+	AC_MSG_ERROR([c-ares library is defective or too old])
	dnl restore initial settings
	CPPFLAGS="$clean_CPPFLAGS"
	LDFLAGS="$clean_LDFLAGS"