diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-20 22:00:16 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-20 22:00:16 (GMT) |
| commit | bfd810a14f0f262b346132dbbcc9e49070bb2834 (patch) | |
| tree | 9b1e16b703a9cbc862b221a59ab3f7fbbcb1b153 /src/network | |
| parent | e7000e016e82ca9ca64db9246ccbef8fc1efa279 (diff) | |
| parent | d5f606f111527516bfe038a4045c8ec92f0499f7 (diff) | |
| download | Qt-bfd810a14f0f262b346132dbbcc9e49070bb2834.zip Qt-bfd810a14f0f262b346132dbbcc9e49070bb2834.tar.gz Qt-bfd810a14f0f262b346132dbbcc9e49070bb2834.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index ae4d257..ccdbb20 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -743,7 +743,7 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest() return; // try to get a free AND connected socket for (int i = 0; i < channelCount; ++i) { - if (!channels[i].isSocketBusy() && channels[i].socket->state() == QAbstractSocket::ConnectedState) { + if (!channels[i].reply && !channels[i].isSocketBusy() && channels[i].socket->state() == QAbstractSocket::ConnectedState) { dequeueAndSendRequest(channels[i].socket); } } @@ -753,7 +753,7 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest() return; // try to get a free unconnected socket for (int i = 0; i < channelCount; ++i) { - if (!channels[i].isSocketBusy()) { + if (!channels[i].reply && !channels[i].isSocketBusy()) { dequeueAndSendRequest(channels[i].socket); } } |