]> granicus.if.org Git - curl/commitdiff
threaded-resolver: revert Curl_expire_latest() switch
authorDaniel Stenberg <daniel@haxx.se>
Tue, 23 Sep 2014 09:44:03 +0000 (11:44 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Tue, 23 Sep 2014 09:44:03 +0000 (11:44 +0200)
The switch to using Curl_expire_latest() in commit cacdc27f52b was a
mistake and was against the advice even mentioned in that commit. The
comparison in asyn-thread.c:Curl_resolver_is_resolved() makes
Curl_expire() the suitable function to use.

Bug: http://curl.haxx.se/bug/view.cgi?id=1426
Reported-By: graysky
lib/asyn-thread.c

index e4ad32bb7dd53ffb14beefc58236c71dfdc6b6b2..6cdc9adff44796ed2e933abeff5a6a3baa2ba29e 100644 (file)
@@ -541,7 +541,7 @@ CURLcode Curl_resolver_is_resolved(struct connectdata *conn,
       td->poll_interval = 250;
 
     td->interval_end = elapsed + td->poll_interval;
-    Curl_expire_latest(conn->data, td->poll_interval);
+    Curl_expire(conn->data, td->poll_interval);
   }
 
   return CURLE_OK;