Title: [198032] tags/Safari-602.1.22
Diff
Modified: tags/Safari-602.1.22/LayoutTests/ChangeLog (198031 => 198032)
--- tags/Safari-602.1.22/LayoutTests/ChangeLog 2016-03-11 19:03:55 UTC (rev 198031)
+++ tags/Safari-602.1.22/LayoutTests/ChangeLog 2016-03-11 19:05:22 UTC (rev 198032)
@@ -1,3 +1,19 @@
+2016-03-11 Babak Shafiei <[email protected]>
+
+ Merge r198027.
+
+ 2016-03-11 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r197984.
+
+ This change caused an existing LayoutTest to fail
+
+ Reverted changeset:
+
+ "WebKit should not be redirected to an invalid URL"
+ https://bugs.webkit.org/show_bug.cgi?id=155263
+ http://trac.webkit.org/changeset/197984
+
2016-03-11 Yoav Weiss <[email protected]>
Avoid applying link tags with an invalid media attribute
Deleted: tags/Safari-602.1.22/LayoutTests/http/tests/navigation/redirect-to-invalid-url-expected.txt (198031 => 198032)
--- tags/Safari-602.1.22/LayoutTests/http/tests/navigation/redirect-to-invalid-url-expected.txt 2016-03-11 19:03:55 UTC (rev 198031)
+++ tags/Safari-602.1.22/LayoutTests/http/tests/navigation/redirect-to-invalid-url-expected.txt 2016-03-11 19:05:22 UTC (rev 198032)
@@ -1,6 +0,0 @@
-http://127.0.0.1:8000/navigation/resources/redirect-to-invalid-url-frame.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/redirect-to-invalid-url-frame.php, main document URL http://127.0.0.1:8000/navigation/redirect-to-invalid-url.html, http method GET> redirectResponse (null)
-http://127.0.0.1:8000/navigation/redirect-to-invalid-url.html - didFinishLoading
-http://127.0.0.1:8000/navigation/resources/redirect-to-invalid-url-frame.php - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/navigation/resources/redirect-to-invalid-url-frame.php">
-Test passes if WebKit doesn't request the redirected URL.
-
-
Deleted: tags/Safari-602.1.22/LayoutTests/http/tests/navigation/redirect-to-invalid-url.html (198031 => 198032)
--- tags/Safari-602.1.22/LayoutTests/http/tests/navigation/redirect-to-invalid-url.html 2016-03-11 19:03:55 UTC (rev 198031)
+++ tags/Safari-602.1.22/LayoutTests/http/tests/navigation/redirect-to-invalid-url.html 2016-03-11 19:05:22 UTC (rev 198032)
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpResourceLoadCallbacks();
- testRunner.waitUntilDone();
- }
-
- _onload_ = function() {
- if (window.testRunner)
- testRunner.notifyDone();
- }
-</script>
-</head>
-<body>
- <p>Test passes if WebKit doesn't request the redirected URL.</p>
- <iframe src=""
-</body>
-</html>
Deleted: tags/Safari-602.1.22/LayoutTests/http/tests/navigation/resources/redirect-to-invalid-url-frame.php (198031 => 198032)
--- tags/Safari-602.1.22/LayoutTests/http/tests/navigation/resources/redirect-to-invalid-url-frame.php 2016-03-11 19:03:55 UTC (rev 198031)
+++ tags/Safari-602.1.22/LayoutTests/http/tests/navigation/resources/redirect-to-invalid-url-frame.php 2016-03-11 19:05:22 UTC (rev 198032)
@@ -1,4 +0,0 @@
-<?php
-header('Location: http://localhost:xyz/none-existed.html');
-?>
-
Modified: tags/Safari-602.1.22/Source/WebCore/ChangeLog (198031 => 198032)
--- tags/Safari-602.1.22/Source/WebCore/ChangeLog 2016-03-11 19:03:55 UTC (rev 198031)
+++ tags/Safari-602.1.22/Source/WebCore/ChangeLog 2016-03-11 19:05:22 UTC (rev 198032)
@@ -1,3 +1,19 @@
+2016-03-11 Babak Shafiei <[email protected]>
+
+ Merge r198027.
+
+ 2016-03-11 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r197984.
+
+ This change caused an existing LayoutTest to fail
+
+ Reverted changeset:
+
+ "WebKit should not be redirected to an invalid URL"
+ https://bugs.webkit.org/show_bug.cgi?id=155263
+ http://trac.webkit.org/changeset/197984
+
2016-03-11 David Kilzer <[email protected]>
REGRESSION (r197956): WebContent process crashes on launch due to unrecognized selector
Modified: tags/Safari-602.1.22/Source/WebCore/loader/SubresourceLoader.cpp (198031 => 198032)
--- tags/Safari-602.1.22/Source/WebCore/loader/SubresourceLoader.cpp 2016-03-11 19:03:55 UTC (rev 198031)
+++ tags/Safari-602.1.22/Source/WebCore/loader/SubresourceLoader.cpp 2016-03-11 19:05:22 UTC (rev 198032)
@@ -160,11 +160,6 @@
URL previousURL = request().url();
Ref<SubresourceLoader> protect(*this);
- if (!newRequest.url().isValid()) {
- cancel();
- return;
- }
-
ASSERT(!newRequest.isNull());
if (!redirectResponse.isNull()) {
// CachedResources are keyed off their original request URL.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
