From 84d5333cc491ec1855c33fdc309059e4fba6289a Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Apr 26 2013 15:08:38 +0000 Subject: prevent an artificial timeout event due to stale speed-check data (#906031) --- diff --git a/0013-curl-7.27.0-b37b5233.patch b/0013-curl-7.27.0-b37b5233.patch new file mode 100644 index 0000000..63c2779 --- /dev/null +++ b/0013-curl-7.27.0-b37b5233.patch @@ -0,0 +1,35 @@ +From a0d7db27c1cf8edbde1d468d655be942bcacb39c Mon Sep 17 00:00:00 2001 +From: Zdenek Pavlas +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 +--- + lib/url.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/lib/url.c b/lib/url.c +index 87b8701..da53086 100644 +--- a/lib/url.c ++++ b/lib/url.c +@@ -5058,6 +5058,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 5db959b..4258594 100644 --- a/curl.spec +++ b/curl.spec @@ -44,6 +44,9 @@ Patch11: 0011-curl-7.27.0-2eb8dcf2.patch # show proper host name on failed resolve (#957173) Patch12: 0012-curl-7.27.0-25e577b3.patch +# prevent an artificial timeout event due to stale speed-check data (#906031) +Patch13: 0013-curl-7.27.0-b37b5233.patch + # patch making libcurl multilib ready Patch101: 0101-curl-7.27.0-multilib.patch @@ -149,6 +152,7 @@ documentation of the library, too. %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 # Fedora patches %patch101 -p1 @@ -273,6 +277,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Fri Apr 26 2013 Kamil Dudka 7.27.0-9 +- 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 7.27.0-8