millisecond resolution support followup

diff --git a/ares/ares_process.c b/ares/ares_process.c
index eca363aec5ad5c592f99193a28bcee992b341c2c..660ad301124ec4285bfd33dc60e2821375b9d0d1 100644 (file)
--- 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 ce98491532c8359703754aec8a110efe44a30923..18ef6e8cad7a42c480fcea4e6ede99e3497fe2c9 100644 (file)
--- 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