Revert "Fix a missing error-signal when a server is shut down while downloading"

This reverts commit cbf7a7782f465846455a5fd5df339ebde31a5521.

This commit caused autotest regressions in tst_qdeclarativeloader and
tst_qdeclarativetext; reverting it for now until this has been
resolved.

2 files changed, 1 insertions, 18 deletions

diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index a47e619..c8caad4 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -66,7 +66,6 @@ QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel()
     , bytesTotal(0)
     , resendCurrent(false)
     , lastStatus(0)
-    , unhandledError(QNetworkReply::NoError)
     , pendingEncrypt(false)
     , reconnectAttempts(2)
     , authMethod(QAuthenticatorPrivate::None)
@@ -643,21 +642,7 @@ void QHttpNetworkConnectionChannel::allDone()
     // slot connected to it. The socket will not fire readyRead signal, if we are already
     // in the slot connected to readyRead
     if (emitFinished)
-    {
-        // Check whether _q_error was invoked previously and if it left a socket
-        // error unhandled.
-        if(unhandledError != QNetworkReply::NoError) {
-            QString errorString = connection->d_func()->errorDetail(unhandledError, socket, socket->errorString());
-            qRegisterMetaType<QNetworkReply::NetworkError>("QNetworkReply::NetworkError");
-            QMetaObject::invokeMethod(reply, "finishedWithError",
-                Qt::QueuedConnection,
-                Q_ARG(QNetworkReply::NetworkError, unhandledError),
-                Q_ARG(QString, errorString));
-            unhandledError = QNetworkReply::NoError; // Reset the value
-        } else {
-            QMetaObject::invokeMethod(reply, "finished", Qt::QueuedConnection);
-        }
-    }
+        QMetaObject::invokeMethod(reply, "finished", Qt::QueuedConnection);
     // reset the reconnection attempts after we receive a complete reply.
     // in case of failures, each channel will attempt two reconnects before emitting error.
     reconnectAttempts = 2;
@@ -979,7 +964,6 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
                 errorCode = QNetworkReply::RemoteHostClosedError;
             }
         } else {
-            unhandledError = QNetworkReply::RemoteHostClosedError;
             return;
         }
         break;
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index e1d42fb..fd18042 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -105,7 +105,6 @@ public:
     qint64 bytesTotal;
     bool resendCurrent;
     int lastStatus; // last status received on this channel
-    QNetworkReply::NetworkError unhandledError; // Stored code of an unhandled error.
     bool pendingEncrypt; // for https (send after encrypted)
     int reconnectAttempts; // maximum 2 reconnection attempts
     QAuthenticatorPrivate::Method authMethod;