Make the rules for redirects a bit stricter.

Change-Id: I7a3cec664aa028202de3d3bda9f499e4deb2998d

Gbp-Pq: Name make_rules_for_redirect_stricter.patch

diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index 3348a7d2775bcbcdd0d03bc424b8aff6b42dc0d6..2da0cf95a72e73c290285a4c40f362e3d86df313 100644 (file)
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -1270,9 +1270,11 @@ void QDeclarativeXMLHttpRequest::finished()
         QVariant redirect = m_network->attribute(QNetworkRequest::RedirectionTargetAttribute);
         if (redirect.isValid()) {
             QUrl url = m_network->url().resolved(redirect.toUrl());
-            destroyNetwork();
-            requestFromUrl(url);
-            return;
+            if (url.scheme().toLower() != QLatin1String("file")) {
+                destroyNetwork();
+                requestFromUrl(url);
+                return;
+            }
         }
     }