aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Pavlas <zpavlas@redhat.com>2013-04-26 14:56:38 +0200
committerKamil Dudka <kdudka@redhat.com>2013-04-26 15:38:22 +0200
commitb37b5233cab96b5b1f2ab7f6e0b9c3df77320bba (patch)
treebf0a6af33d944c6886930e9ec34620430f3d95a1
parentc68c7e588e40d2d25c1d1179b3e7d1b4af4593fd (diff)
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
-rw-r--r--RELEASE-NOTES3
-rw-r--r--lib/url.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c4c82bcd0..dfcac326b 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 cef8a9806..b1ba8f1df 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