From 95c15fce0c92d93684aa11b2bfd0a92bfbf9d1da Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 29 Sep 2007 14:25:14 +0000 Subject: TCP queries can time out too, not just UDP queries. (Patch from the Google tree.) --- ares/ares_process.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ares/ares_process.c b/ares/ares_process.c index 9e03e4034..2171011e0 100644 --- a/ares/ares_process.c +++ b/ares/ares_process.c @@ -634,7 +634,6 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now) server->qhead = sendreq; } server->qtail = sendreq; - query->timeout = 0; query->server_info[query->server].tcp_connection_generation = server->tcp_connection_generation; } @@ -656,10 +655,10 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now) next_server(channel, query, now); return; } - query->timeout = now - + ((query->try == 0) ? channel->timeout - : channel->timeout << query->try / channel->nservers); } + query->timeout = now + + ((query->try == 0) ? channel->timeout + : channel->timeout << query->try / channel->nservers); } /* -- cgit v1.2.3