TCP queries can time out too, not just UDP queries. (Patch from the Google tree.)

This commit is contained in:
Steinar H. Gunderson 2007-09-29 14:25:14 +00:00
parent c788efffd4
commit 95c15fce0c
1 changed files with 3 additions and 4 deletions

View File

@ -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);
}
/*