From 164a98511548585e587aa51f59d3cce72794700d Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Thu, 15 May 2008 22:57:33 +0000
Subject: [PATCH] millisecond resolution support followup
---
ares/ares_process.c | 2 +-
ares/ares_timeout.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ares/ares_process.c b/ares/ares_process.c
index eca363aec5..660ad30112 100644
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -110,7 +110,7 @@ int ares__timedout(struct timeval *now,
if(secs > 0)
return 1; /* yes, timed out */
- if(secs < -1)
+ if(secs < 0)
return 0; /* nope, not timed out */
/* if the full seconds were identical, check the sub second parts */
diff --git a/ares/ares_timeout.c b/ares/ares_timeout.c
index ce98491532..18ef6e8cad 100644
--- a/ares/ares_timeout.c
+++ b/ares/ares_timeout.c
@@ -64,8 +64,8 @@ struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
}
if(min_offset != -1) {
- nextstop = now;
- ares__timeadd(&now, min_offset);
+ nextstop.tv_sec = min_offset/1000;
+ nextstop.tv_usec = (min_offset%1000)*1000;
}
/* If we found a minimum timeout and it's sooner than the one specified in
--
GitLab