Title: [129693] branches/chromium/1271
- Revision
- 129693
- Author
- cev...@google.com
- Date
- 2012-09-26 13:21:30 -0700 (Wed, 26 Sep 2012)
Log Message
Merge 129585
BUG=145915
Review URL: https://codereview.chromium.org/10993046
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1271/LayoutTests/http/tests/security/resources/set-cookie.php (from rev 129585, trunk/LayoutTests/http/tests/security/resources/set-cookie.php) (0 => 129693)
--- branches/chromium/1271/LayoutTests/http/tests/security/resources/set-cookie.php (rev 0)
+++ branches/chromium/1271/LayoutTests/http/tests/security/resources/set-cookie.php 2012-09-26 20:21:30 UTC (rev 129693)
@@ -0,0 +1,4 @@
+<?php
+setcookie($_GET["name"], $_GET["value"], 0, "/");
+?>
+Set <?= $_GET["name"] ?>=<?= $_GET["value"] ?>
Copied: branches/chromium/1271/LayoutTests/http/tests/security/svg-image-leak-expected.txt (from rev 129585, trunk/LayoutTests/http/tests/security/svg-image-leak-expected.txt) (0 => 129693)
--- branches/chromium/1271/LayoutTests/http/tests/security/svg-image-leak-expected.txt (rev 0)
+++ branches/chromium/1271/LayoutTests/http/tests/security/svg-image-leak-expected.txt 2012-09-26 20:21:30 UTC (rev 129693)
@@ -0,0 +1,4 @@
+ALERT: PASS
+First we load an image as a control to make sure we can set cookies:
+ Then we load an SVGImage to see if we can issue network requests from inside the image:
+
Copied: branches/chromium/1271/LayoutTests/http/tests/security/svg-image-leak.html (from rev 129585, trunk/LayoutTests/http/tests/security/svg-image-leak.html) (0 => 129693)
--- branches/chromium/1271/LayoutTests/http/tests/security/svg-image-leak.html (rev 0)
+++ branches/chromium/1271/LayoutTests/http/tests/security/svg-image-leak.html 2012-09-26 20:21:30 UTC (rev 129693)
@@ -0,0 +1,51 @@
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+window.addEventListener("load", function() {
+ var cookie = document.cookie;
+
+ if (/font/.test(cookie) || /import/.test(cookie))
+ alert("FAIL! Cookies received: " + cookie);
+ else if (/img/.test(cookie))
+ alert("PASS");
+ else
+ alert("FAIL: Did not receive any cookies.")
+
+ document.cookie = "img=; Max-Age=-1; Path=/";
+ document.cookie = "font=; Max-Age=-1; Path=/";
+ document.cookie = "import=; Max-Age=-1; Path=/";
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, false);
+</script>
+First we load an image as a control to make sure we can set cookies:<br>
+<img src=""
+
+Then we load an SVGImage to see if we can issue network requests from inside the image:<br>
+<img height=200px src=''>
Modified: branches/chromium/1271/Source/WebCore/platform/network/chromium/ResourceHandle.cpp (129692 => 129693)
--- branches/chromium/1271/Source/WebCore/platform/network/chromium/ResourceHandle.cpp 2012-09-26 20:10:16 UTC (rev 129692)
+++ branches/chromium/1271/Source/WebCore/platform/network/chromium/ResourceHandle.cpp 2012-09-26 20:21:30 UTC (rev 129693)
@@ -218,6 +218,9 @@
bool ResourceHandle::start(NetworkingContext* context)
{
+ if (!context)
+ return false;
+
d->start();
return true;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
