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

This commit is contained in:
Kamil Dudka 2013-04-26 16:24:46 +02:00
parent 091c1bdc33
commit 50e53d0748
2 changed files with 40 additions and 0 deletions

View File

@ -0,0 +1,35 @@
From 2ef6dfe7ef237f1e593c70097d69d4fc80129be8 Mon Sep 17 00:00:00 2001
From: Zdenek Pavlas <zpavlas@redhat.com>
Date: Fri, 26 Apr 2013 14:56:38 +0200
Subject: [PATCH] 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@redhat.com>
---
lib/url.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/lib/url.c b/lib/url.c
index 466748b..5eb1ab8 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -4970,6 +4970,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

View File

@ -35,6 +35,9 @@ Patch8: 0008-curl-7.24.0-2eb8dcf2.patch
# show proper host name on failed resolve (#957173)
Patch9: 0009-curl-7.24.0-25e577b3.patch
# prevent an artificial timeout event due to stale speed-check data (#906031)
Patch10: 0010-curl-7.24.0-b37b5233.patch
# patch making libcurl multilib ready
Patch101: 0101-curl-7.21.1-multilib.patch
@ -143,6 +146,7 @@ done
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
# Fedora patches
%patch101 -p1
@ -257,6 +261,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Apr 26 2013 Kamil Dudka <kdudka@redhat.com> 7.24.0-8
- 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@redhat.com> 7.24.0-7