From: Steinar H. Gunderson <sesse@google.com>
Date: Fri, 28 Sep 2007 15:51:00 +0000 (+0000)
Subject: Forgot to include a few hunks from ares_process.c earlier. Fixing now.
X-Git-Tag: upstream/1.10.0~964
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c24cd24870f59bcfec461472d100ee78cc41a423;p=platform%2Fupstream%2Fc-ares.git

Forgot to include a few hunks from ares_process.c earlier. Fixing now.
---

diff --git a/ares_process.c b/ares_process.c
index 1db3d11..fdd620b 100644
--- a/ares_process.c
+++ b/ares_process.c
@@ -70,6 +70,7 @@ static void handle_error(ares_channel channel, int whichserver, time_t now);
 static void skip_server(ares_channel channel, struct query *query,
                         int whichserver);
 static struct query *next_server(ares_channel channel, struct query *query, time_t now);
+static int configure_socket(int s, ares_channel channel);
 static int open_tcp_socket(ares_channel channel, struct server_state *server);
 static int open_udp_socket(ares_channel channel, struct server_state *server);
 static int same_questions(const unsigned char *qbuf, int qlen,
@@ -424,6 +425,7 @@ static void process_timeouts(ares_channel channel, time_t now)
       if (query->timeout != 0 && now >= query->timeout)
         {
           query->error_status = ARES_ETIMEOUT;
+          ++query->timeouts;
           next = next_server(channel, query, now);
         }
     }