[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
antonm at chromium.org
antonm at chromium.org
Mon Feb 21 00:31:04 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 87c26e7d747d0570a3de0da65d5d7a12ffa4fe56
Author: antonm at chromium.org <antonm at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 1 14:35:10 2011 +0000
2011-02-01 Anton Muhin <antonm at chromium.org>
Reviewed by Adam Barth.
Propagate parent document security origin to newly create Document XML response
https://bugs.webkit.org/show_bug.cgi?id=53444
Covered by the existing tests.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::responseXML):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77246 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 26f97f7..a96d1ed 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-01 Anton Muhin <antonm at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Propagate parent document security origin to newly create Document XML response
+ https://bugs.webkit.org/show_bug.cgi?id=53444
+
+ Covered by the existing tests.
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::responseXML):
+
2011-02-01 Yury Semikhatsky <yurys at chromium.org>
Unreviewed. Rollout r77230 which caused many layout tests
diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp
index 4ad6b17..3e6e0a9 100644
--- a/Source/WebCore/xml/XMLHttpRequest.cpp
+++ b/Source/WebCore/xml/XMLHttpRequest.cpp
@@ -249,6 +249,7 @@ Document* XMLHttpRequest::responseXML(ExceptionCode& ec)
m_responseXML = Document::create(0, m_url);
// FIXME: Set Last-Modified.
m_responseXML->setContent(m_responseBuilder.toStringPreserveCapacity());
+ m_responseXML->setSecurityOrigin(document()->securityOrigin());
if (!m_responseXML->wellFormed())
m_responseXML = 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list