Commit ab6d2327 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Curl_expire_latest: ignore already expired timers 

If the existing timer is still in there but has expired, the new timer
should be added.

Reported-by: Rainer Canavan
Bug: https://curl.haxx.se/mail/lib-2017-04/0030.html
Closes #1407
parent f7991305

lib/multi.c

+5 −2
Changes for lib/multi.c: 5 added lines, 2 removed lines.
Original line number Original line Diff line number Diff line
@@ -3003,10 +3003,13 @@ void Curl_expire_latest(struct Curl_easy *data, time_t milli) 
       Compare if the new time is earlier, and only remove-old/add-new if it

       Compare if the new time is earlier, and only remove-old/add-new if it

       is. */

       is. */

    time_t diff = curlx_tvdiff(set, *expire);

    time_t diff = curlx_tvdiff(set, *expire);

    if(diff > 0)

    if((diff > 0) && (diff < milli)) {

      /* the new expire time was later than the top time, so just skip this */

      /* if the new expire time is later than the top time, skip it, but not

         if the diff is larger than the new offset since then the previous

         time is already expired! */

      return;

      return;

    }

    }

  }





  /* Just add the timeout like normal */

  /* Just add the timeout like normal */

  Curl_expire(data, milli);

  Curl_expire(data, milli);

tests/data/test1238

+1 −1
Changes for tests/data/test1238: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ TFTP RRQ 
# Server-side

# Server-side

<reply>

<reply>

<servercmd>

<servercmd>

writedelay: 1

writedelay: 2

</servercmd>

</servercmd>

# ~1200 bytes (so that they don't fit in two 512 byte chunks)

# ~1200 bytes (so that they don't fit in two 512 byte chunks)

<data nocheck="yes">

<data nocheck="yes">