Roy Shan fixed a case that prevented ares name resolve timeouts to occur.
This commit is contained in:
parent
310086deed
commit
ee1595dcd5
@ -587,8 +587,9 @@ CURLcode Curl_is_resolved(struct connectdata *conn,
|
|||||||
count = select(nfds, &read_fds, &write_fds, NULL,
|
count = select(nfds, &read_fds, &write_fds, NULL,
|
||||||
(struct timeval *)&tv);
|
(struct timeval *)&tv);
|
||||||
|
|
||||||
if(count)
|
/* Call ares_process() unconditonally here, even if we simply timed out
|
||||||
ares_process(data->state.areschannel, &read_fds, &write_fds);
|
above, as otherwise the ares name resolve won't timeout! */
|
||||||
|
ares_process(data->state.areschannel, &read_fds, &write_fds);
|
||||||
|
|
||||||
*dns = NULL;
|
*dns = NULL;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user