curl: patch for xbmc regression via Arch.
See http://curl.haxx.se/bug/view.cgi?id=1426
This commit is contained in:
parent
513532a4d0
commit
4df7e70dac
2 changed files with 33 additions and 2 deletions
|
@ -0,0 +1,32 @@
|
|||
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
|
||||
--- lib/asyn-thread.c
|
||||
+++ 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;
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template build file for 'curl'.
|
||||
pkgname=curl
|
||||
version=7.38.0
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="ac_cv_sizeof_off_t=8 --disable-ldaps --without-gssapi
|
||||
--enable-threaded-resolver --enable-ipv6
|
||||
|
@ -22,7 +22,6 @@ libcurl_package() {
|
|||
vmove "usr/lib/*.so.*"
|
||||
}
|
||||
}
|
||||
|
||||
libcurl-devel_package() {
|
||||
depends="zlib-devel libidn-devel libressl-devel libcurl>=${version}_${revision}"
|
||||
short_desc="The multiprotocol file transfer library - development files"
|
||||
|
|
Loading…
Reference in a new issue