From: Zdenek Pavlas Date: Fri, 26 Apr 2013 12:56:38 +0000 (+0200) Subject: url: initialize speed-check data for file:// protocol X-Git-Tag: curl-7_31_0~111 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b37b5233cab96b5b1f2ab7f6e0b9c3df77320bba;p=thirdparty%2Fcurl.git 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 --- diff --git a/RELEASE-NOTES b/RELEASE-NOTES index c4c82bcd0f..dfcac326be 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -30,6 +30,7 @@ This release includes the following bugfixes: o CURL_CHECK_CA_BUNDLE: don't check for paths when cross-compiling [4] o Various documentation updates o getinfo.c: reset timecond when clearing session-info variables [5] + o FILE: prevent an artificial timeout event due to stale speed-check data [6] o This release includes the following known bugs: @@ -53,4 +54,4 @@ References to bug reports and discussions on issues: [3] = http://curl.haxx.se/mail/lib-2013-02/0102.html [4] = http://curl.haxx.se/mail/lib-2013-04/0294.html [5] = http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705783 - [6] = + [6] = https://bugzilla.redhat.com/906031 diff --git a/lib/url.c b/lib/url.c index cef8a9806a..b1ba8f1df8 100644 --- a/lib/url.c +++ b/lib/url.c @@ -5193,6 +5193,9 @@ static CURLcode create_conn(struct SessionHandle *data, -1, NULL); /* no upload */ } + /* since we skip do_init() */ + Curl_speedinit(data); + return result; } #endif