Commit 164a9851 authored by Yang Tse's avatar Yang Tse
Browse files

millisecond resolution support followup

parent ade57a78

ares/ares_process.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

ares/ares_timeout.c

+2 −2
Original line number Diff line number Diff line
@@ -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