romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-15 00:01:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

hostip: fix !no_signal mixup in resolve refaactor

Browse source 
When extracting the resolve case using alarm timers, the check for "we
are not allowed to use signals" was refactored wrong.

Follow-up to 96d5b5c688

Closes #21047
This commit is contained in:
Stefan Eissing 2026-03-21 13:49:12 +01:00 • committed by Daniel Stenberg
parent d560002551
commit 745344ea4e
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/hostip.c
View file

@ -637,7 +637,7 @@ static CURLcode resolv_alarm_timeout(struct Curl_easy *data,
DEBUGASSERT(hostname && *hostname);
DEBUGASSERT(timeoutms > 0);
DEBUGASSERT(data->set.no_signal);
DEBUGASSERT(!data->set.no_signal);
#ifndef CURL_DISABLE_DOH
DEBUGASSERT(!data->set.doh);
#endif
@ -783,7 +783,7 @@ CURLcode Curl_resolv(struct Curl_easy *data,
return CURLE_OPERATION_TIMEDOUT;
#ifdef USE_ALARM_TIMEOUT
if(timeoutms && !data->set.no_signal) {
if(timeoutms && data->set.no_signal) {
/* Cannot use ALARM when signals are disabled */
timeoutms = 0;
}

2
tests/http/test_06_eyeballs.py
View file

@ -105,6 +105,8 @@ class TestEyeballs:
# check timers when trying 3 unresponsive addresses
@pytest.mark.skipif(condition=not Env.curl_has_feature('IPv6'),
reason='curl lacks ipv6 support')
@pytest.mark.skipif(condition=not Env.curl_has_feature('AsynchDNS'),
reason='curl lacks async DNS support')
@pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings")
def test_06_13_timers(self, env: Env):
curl = CurlClient(env=env)