Commit 95c15fce authored by Steinar H. Gunderson's avatar Steinar H. Gunderson
Browse files

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

parent c788efff

ares/ares_process.c

+3 −4
Original line number Diff line number Diff line
@@ -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,11 +655,11 @@ 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);

}

}



/*

 * nonblock() set the given socket to either blocking or non-blocking mode