Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/gui/image/qjpeghandler.cpp

Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0

1 files changed, 4 insertions, 0 deletions

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index cf786e37c6..accad6e4c0 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -377,6 +377,8 @@ void QHttpNetworkConnectionPrivate::emitReplyError(QAbstractSocket *socket,
         // Clean the channel
         channels[i].close();
         channels[i].reply = 0;
+        if (channels[i].protocolHandler)
+            channels[i].protocolHandler->setReply(0);
         channels[i].request = QHttpNetworkRequest();
         if (socket)
             channels[i].requeueCurrentlyPipelinedRequests();
@@ -826,6 +828,8 @@ void QHttpNetworkConnectionPrivate::removeReply(QHttpNetworkReply *reply)
         // is the reply associated the currently processing of this channel?
         if (channels[i].reply == reply) {
             channels[i].reply = 0;
+            if (channels[i].protocolHandler)
+                channels[i].protocolHandler->setReply(0);
             channels[i].request = QHttpNetworkRequest();
             channels[i].resendCurrent = false;