diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 08:18:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 08:18:53 (GMT) |
| commit | 991e54881ea827eaab74078dfbded48e45d0b689 (patch) | |
| tree | 8ad8e0eb5f795ad84c6102d401784fe61d9a0e46 /src | |
| parent | 162bc6d94fadbfc9216d45eede4dc6d4fc2d5eef (diff) | |
| parent | 8902980cec40b25ec85ec20f79858224f68f73b6 (diff) | |
| download | Qt-991e54881ea827eaab74078dfbded48e45d0b689.zip Qt-991e54881ea827eaab74078dfbded48e45d0b689.tar.gz Qt-991e54881ea827eaab74078dfbded48e45d0b689.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM HTTP: Only force read when actual bytes available
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 22dd5cb..6a13669 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -291,7 +291,8 @@ bool QHttpNetworkConnectionChannel::sendRequest() // ensure we try to receive a reply in all cases, even if _q_readyRead_ hat not been called // this is needed if the sends an reply before we have finished sending the request. In that // case receiveReply had been called before but ignored the server reply - QMetaObject::invokeMethod(this, "_q_receiveReply", Qt::QueuedConnection); + if (socket->bytesAvailable()) + QMetaObject::invokeMethod(this, "_q_receiveReply", Qt::QueuedConnection); break; } case QHttpNetworkConnectionChannel::ReadingState: |