38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
This fixes a timeout problem with xbmc.
|
|
|
|
Backported from upstream:
|
|
https://github.com/bagder/curl/commit/d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
|
|
|
|
From d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
|
Date: Tue, 23 Sep 2014 11:44:03 +0200
|
|
Subject: [PATCH] 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
|
|
---
|
|
lib/asyn-thread.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
|
|
index e4ad32b..6cdc9ad 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;
|