From fa175169b40735461f9647857143196679858724 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 24 Aug 2010 15:30:45 +0200
Subject: QNAM HTTP: Fix a warning

tst_qnetworkreply:getAndThenDeleteObject had a QNativeSocketEngine
warning that is now not coming anymore.
---
 src/network/access/qhttpnetworkconnectionchannel.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index fe5532e..e39f9ed 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -883,7 +883,9 @@ void QHttpNetworkConnectionChannel::_q_readyRead()
 {
     // We got a readyRead but no bytes are available..
     // This happens for the Unbuffered QTcpSocket
-    if (socket->bytesAvailable() == 0) {
+    // Also check if socket is in ConnectedState since
+    // this function may also be invoked via the event loop.
+    if (socket->state() == QAbstractSocket::ConnectedState && socket->bytesAvailable() == 0) {
         char c;
         qint64  ret = socket->peek(&c, 1);
         if (ret < 0) {
-- 
cgit v0.12