[curl/f21] Resolves: #1172572 - make CURLOPT_LOW_SPEED_LIMIT work again with threaded-resolver

[Kamil Dudka]

commit 105f3c8c0da38fe026e6861fd1a6bba355ceff3b
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Wed Dec 10 16:24:14 2014 +0100

    Resolves: #1172572 - make CURLOPT_LOW_SPEED_LIMIT work again with threaded-resolver

 0008-curl-7.37.0-cacdc27f.patch |   38 +++++++++++++++++++++++++++++++++++++-
 curl.spec                       |    5 ++++-
 2 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/0008-curl-7.37.0-cacdc27f.patch b/0008-curl-7.37.0-cacdc27f.patch
index 62ebd20..d84adfa 100644
--- a/0008-curl-7.37.0-cacdc27f.patch
+++ b/0008-curl-7.37.0-cacdc27f.patch
@@ -1,7 +1,7 @@
 From a16ae697b1255b51f88e2e2ed05a0dafc6d91556 Mon Sep 17 00:00:00 2001
 From: Daniel Stenberg <daniel at haxx.se>
 Date: Mon, 25 Aug 2014 11:34:14 +0200
-Subject: [PATCH] low-speed-limit: avoid timeout flood
+Subject: [PATCH 1/2] low-speed-limit: avoid timeout flood
 
 Introducing Curl_expire_latest(). To be used when we the code flow only
 wants to get called at a later time that is "no later than X" so that
@@ -185,3 +185,39 @@ index ea17a59..a9b421d 100644
 -- 
 2.1.0
 
+
+From b7abc7d64288949b7e1f955930e7f492ac1000d5 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Tue, 23 Sep 2014 11:44:03 +0200
+Subject: [PATCH 2/2] 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
+
+Upstream-commit: d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1
+Signed-off-by: Kamil Dudka <kdudka at redhat.com>
+---
+ 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 7fe6472..c72c064 100644
+--- a/lib/asyn-thread.c
++++ b/lib/asyn-thread.c
+@@ -502,7 +502,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
+
diff --git a/curl.spec b/curl.spec
index 7bdabb2..b1f63fd 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.37.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -274,6 +274,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Dec 10 2014 Kamil Dudka <kdudka at redhat.com> 7.37.0-11
+- make CURLOPT_LOW_SPEED_LIMIT work again with threaded-resolver (#1172572)
+
 * Fri Nov 21 2014 Kamil Dudka <kdudka at redhat.com> 7.37.0-10
 - disable libcurl-level downgrade to SSLv3 (#1166567)
 - low-speed-limit: avoid timeout flood (#1166239)