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 8fe6215904
commit 97702c76cc
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,35 @@
From 7a90359b61407cc63e6a8337602ac8ed70775475 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 4399162..19a3a38 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -5010,6 +5010,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

@ -1,7 +1,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
Version: 7.30.0
Release: 1%{?dist}
Release: 2%{?dist}
License: MIT
Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@ -10,6 +10,9 @@ Source2: curlbuild.h
# prevent test-suite failure due to using non-default port ranges in tests
Patch1: 0001-curl-7.30.0-ddbda328.patch
# prevent an artificial timeout event due to stale speed-check data (#906031)
Patch2: 0002-curl-7.30.0-b37b5233.patch
# patch making libcurl multilib ready
Patch101: 0101-curl-7.30.0-multilib.patch
@ -104,6 +107,7 @@ documentation of the library, too.
# upstream patches
%patch1 -p1
%patch2 -p1
# Fedora patches
%patch101 -p1
@ -223,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4
%changelog
* Fri Apr 26 2013 Kamil Dudka <kdudka@redhat.com> 7.30.0-2
- prevent an artificial timeout event due to stale speed-check data (#906031)
* Fri Apr 12 2013 Kamil Dudka <kdudka@redhat.com> 7.30.0-1
- new upstream release (fixes CVE-2013-1944)
- prevent test-suite failure due to using non-default port ranges in tests