[curl/f19] prevent an artificial timeout event due to stale speed-check data (#906031)

[Kamil Dudka]

commit 08d44ee3382b58b224e784682cd4be4d5baae207
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Fri Apr 26 16:24:46 2013 +0200

    prevent an artificial timeout event due to stale speed-check data (#906031)

 0007-curl-7.29.0-b37b5233.patch |   35 +++++++++++++++++++++++++++++++++++
 curl.spec                       |    5 +++++
 2 files changed, 40 insertions(+), 0 deletions(-)
---
diff --git a/0007-curl-7.29.0-b37b5233.patch b/0007-curl-7.29.0-b37b5233.patch
new file mode 100644
index 0000000..0f6a0c1
--- /dev/null
+++ b/0007-curl-7.29.0-b37b5233.patch
@@ -0,0 +1,35 @@
+From fd5664bc7322ebffb8d5532d17a743ace8a5449e Mon Sep 17 00:00:00 2001
+From: Zdenek Pavlas <zpavlas at redhat.com>
+Date: Fri, 26 Apr 2013 14:56:38 +0200
+Subject: [PATCH 2/2] url: initialize speed-check data for file:// protocol
+
+... in order to prevent an artificial timeout event based on stale
+speed-check data from a previous network transfer.  This commit fixes
+a regression caused by 9dd85bced56f6951107f69e581c872c1e7e3e58e.
+
+Bug: https://bugzilla.redhat.com/906031
+
+[upstream commit b37b5233cab96b5b1f2ab7f6e0b9c3df77320bba]
+
+Signed-off-by: Kamil Dudka <kdudka at redhat.com>
+---
+ lib/url.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/lib/url.c b/lib/url.c
+index 918ce58..b269027 100644
+--- a/lib/url.c
++++ b/lib/url.c
+@@ -4895,6 +4895,9 @@ static CURLcode create_conn(struct SessionHandle *data,
+                           -1, NULL); /* no upload */
+     }
+ 
++    /* since we skip do_init() */
++    Curl_speedinit(data);
++
+     return result;
+   }
+ #endif
+-- 
+1.7.1
+
diff --git a/curl.spec b/curl.spec
index 36041b8..c065cdc 100644
--- a/curl.spec
+++ b/curl.spec
@@ -25,6 +25,9 @@ Patch5: 0005-curl-7.29.0-2eb8dcf2.patch
 # show proper host name on failed resolve (#957173)
 Patch6: 0006-curl-7.29.0-25e577b3.patch
 
+# prevent an artificial timeout event due to stale speed-check data (#906031)
+Patch7: 0007-curl-7.29.0-b37b5233.patch
+
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.29.0-multilib.patch
 
@@ -124,6 +127,7 @@ documentation of the library, too.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -242,6 +246,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Fri Apr 26 2013 Kamil Dudka <kdudka at redhat.com> 7.29.0-6
+- prevent an artificial timeout event due to stale speed-check data (#906031)
 - show proper host name on failed resolve (#957173)
 
 * Fri Apr 12 2013 Kamil Dudka <kdudka at redhat.com> 7.29.0-5