summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moore <rich@kde.org>2012-11-19 20:48:39 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-22 22:38:35 +0100
commit96311def2466dd44de64d77a1c815b22fbf68f71 (patch)
tree1aa4e9c48cf6d6833bd76108c924712ff9220dab
parented40beeff54d665e604d0fa861c5865554832964 (diff)
Make the rules for redirects a bit stricter.v4.8.4
Change-Id: I7a3cec664aa028202de3d3bda9f499e4deb2998d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rw-r--r--src/declarative/qml/qdeclarativexmlhttprequest.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index 5378a15688..3de89a55d2 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -1272,9 +1272,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;
+ }
}
}