diff options
| author | Martin Petersson <Martin.Petersson@nokia.com> | 2012-03-14 10:44:31 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-15 00:50:47 +0100 |
| commit | d1a5bb55d9e14105b69d6a17bb63c2f2ecafccf6 (patch) | |
| tree | 565b8a355b8581352d626b146a70363b0cf6a9a6 /src/network | |
| parent | 9e87104295b019a1afa49f856ddcef07249d1afb (diff) | |
QHttpNetworkConnectionChannel: Warn if bytesAvailable and no reply
If there are no bytesAvailable and no reply then the channel
can be closed without any need for this warning.
Task-number: QTBUG-9315
Change-Id: Ifbb1f4732d3173a7807ac5bd0dc78fb5144faaf3
Reviewed-by: Markus Goetz <markus@woboq.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index a009222bd5..d4931bd207 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -357,9 +357,9 @@ void QHttpNetworkConnectionChannel::_q_receiveReply() Q_ASSERT(socket); if (!reply) { - // heh, how should that happen! - qWarning() << "QHttpNetworkConnectionChannel::_q_receiveReply() called without QHttpNetworkReply," - << socket->bytesAvailable() << "bytes on socket."; + if (socket->bytesAvailable() > 0) + qWarning() << "QHttpNetworkConnectionChannel::_q_receiveReply() called without QHttpNetworkReply," + << socket->bytesAvailable() << "bytes on socket."; close(); return; } |