From: Bernd Kuhls Date: Sun, 28 Sep 2014 15:13:45 +0000 (+0200) Subject: package/libcurl: Backport patch to fix xbmc-related timeout bug X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e15cb988e739bc73383687800afef9e057da1da8;p=buildroot.git package/libcurl: Backport patch to fix xbmc-related timeout bug For details see https://github.com/OpenELEC/OpenELEC.tv/commit/82d923895a311e514f6a916ce4d7e06edd2caabb#commitcomment-7952726 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- diff --git a/package/libcurl/libcurl-0001-fixtimeout.patch b/package/libcurl/libcurl-0001-fixtimeout.patch new file mode 100644 index 0000000000..f897ca4d58 --- /dev/null +++ b/package/libcurl/libcurl-0001-fixtimeout.patch @@ -0,0 +1,37 @@ +This fixes a timeout problem with xbmc. + +Backported from upstream: +https://github.com/bagder/curl/commit/d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1 + +Signed-off-by: Bernd Kuhls + + +From d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +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;