From f16733d41b8377a703c594b069cc592466e03a11 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Thu, 11 Feb 2010 13:38:15 +1000
Subject: We don't need to migrate cached replies.

---
 src/network/access/qnetworkreplyimpl.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 81d4d0d..7f12fb8 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -829,6 +829,11 @@ bool QNetworkReplyImplPrivate::migrateBackend()
         return false;
     }
 
+    if (copyDevice) {
+        qDebug() << "Request is serviced from cache, not migrating.";
+        return true;
+    }
+
     RawHeadersList::ConstIterator it = findRawHeader("Accept-Ranges");
     if (it == rawHeaders.constEnd() || it->second == "none") {
         qDebug() << "Range header not supported by server/resource.";
@@ -837,12 +842,6 @@ bool QNetworkReplyImplPrivate::migrateBackend()
 
     qDebug() << "Need to check for only cacheable content.";
 
-    // stop both upload and download
-    if (outgoingData)
-        outgoingData->disconnect(q);
-    if (copyDevice)
-        copyDevice->disconnect(q);
-
     state = QNetworkReplyImplPrivate::Reconnecting;
 
     if (backend) {
-- 
cgit v0.12