diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-03-31 20:50:01 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-03-31 20:50:01 +0000 |
| commit | ee1595dcd54c4e8c56045ec0b3762d6ec45fc178 (patch) | |
| tree | 98126aa9ab9c2d97d69e08b7d2d44e47d6be5bbf | |
| parent | 310086deed04a2a4151f422e10112397c7051a60 (diff) | |
Roy Shan fixed a case that prevented ares name resolve timeouts to occur.
| -rw-r--r-- | lib/hostip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/hostip.c b/lib/hostip.c index ab372c40a..8e02e4701 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -587,8 +587,9 @@ CURLcode Curl_is_resolved(struct connectdata *conn, count = select(nfds, &read_fds, &write_fds, NULL, (struct timeval *)&tv); - if(count) - ares_process(data->state.areschannel, &read_fds, &write_fds); + /* Call ares_process() unconditonally here, even if we simply timed out + above, as otherwise the ares name resolve won't timeout! */ + ares_process(data->state.areschannel, &read_fds, &write_fds); *dns = NULL; |