From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 23 Sep 2014 09:44:03 +0000 (+0200)
Subject: threaded-resolver: revert Curl_expire_latest() switch
X-Git-Tag: curl-7_39_0~206
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1;p=thirdparty%2Fcurl.git

threaded-resolver: revert Curl_expire_latest() switch

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
---

diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
index e4ad32bb7d..6cdc9adff4 100644
--- a/lib/asyn-thread.c
+++ b/lib/asyn-thread.c
@@ -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;