summaryrefslogtreecommitdiffstats
path: root/src/network/access/qhttpnetworkconnection.cpp
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2010-01-29 10:12:48 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2010-02-03 09:22:17 (GMT)
commit4f97685cef49fea0ea0614b6972241c497b4b1a2 (patch)
treecdc9b32642732e7b1261bde80d59e729515c3e93 /src/network/access/qhttpnetworkconnection.cpp
parentd5a3866d20507967e14ed34930f08ce6248000e5 (diff)
downloadQt-4f97685cef49fea0ea0614b6972241c497b4b1a2.zip
Qt-4f97685cef49fea0ea0614b6972241c497b4b1a2.tar.gz
Qt-4f97685cef49fea0ea0614b6972241c497b4b1a2.tar.bz2
QNAM HTTP: Fix bug related to re-sending a request
Thanks Nils Jeisecke for report and proposed fix. Task-number: QTBUG-7713 Reviewed-by: thiago
Diffstat (limited to 'src/network/access/qhttpnetworkconnection.cpp')
-rw-r--r--src/network/access/qhttpnetworkconnection.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index fff7097..cc6a1c8 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -688,8 +688,14 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest()
if (channels[i].resendCurrent) {
channels[i].resendCurrent = false;
channels[i].state = QHttpNetworkConnectionChannel::IdleState;
- if (channels[i].reply)
+ if (channels[i].reply) {
+
+ // if this is not possible, error will be emitted and connection terminated
+ if (!channels[i].resetUploadData())
+ continue;
+
channels[i].sendRequest();
+ }
}
}