Title: [191790] branches/safari-601-branch/LayoutTests
Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (191789 => 191790)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-10-30 13:25:26 UTC (rev 191789)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-10-30 16:51:19 UTC (rev 191790)
@@ -1,3 +1,18 @@
+2015-10-30 Lucas Forschler <[email protected]>
+
+ Merge r188366
+
+ 2015-08-12 Alexey Proskuryakov <[email protected]>
+
+ http/tests/security/cors-post-redirect-308.html doesn't work properly
+ https://bugs.webkit.org/show_bug.cgi?id=147914
+
+ Reviewed by Brady Eidson.
+
+ * http/tests/resources/redirect.php: Trying to return
+ code 308 without a reason phrase results in an internal server error with Apache/2.2.
+ While at it, also corrected the script to always set Cache-Control: no-store.
+
2015-10-29 Lucas Forschler <[email protected]>
Merge r191706. rdar://problem/23319292
Modified: branches/safari-601-branch/LayoutTests/http/tests/resources/redirect.php (191789 => 191790)
--- branches/safari-601-branch/LayoutTests/http/tests/resources/redirect.php 2015-10-30 13:25:26 UTC (rev 191789)
+++ branches/safari-601-branch/LayoutTests/http/tests/resources/redirect.php 2015-10-30 16:51:19 UTC (rev 191790)
@@ -1,20 +1,28 @@
<?php
+ function addCacheControl() {
+ # Workaround for https://bugs.webkit.org/show_bug.cgi?id=77538
+ # Caching redirects results in flakiness in tests that dump loader delegates.
+ header("Cache-Control: no-store");
+ }
+
$url = ""
$refresh = $_GET['refresh'];
if (isset($refresh)) {
header("HTTP/1.1 200");
header("Refresh: $refresh; url=""
+ addCacheControl();
return;
}
$code = $_GET['code'];
if (!isset($code))
- $code = 302;
- header("HTTP/1.1 $code");
+ header("HTTP/1.1 302 Found");
+ elseif ($code == 308) {
+ # Apache 2.2 (and possibly some newer versions) cannot generate a reason string for code 308, and sends a 500 error instead.
+ header("HTTP/1.1 308 Permanent Redirect");
+ } else
+ header("HTTP/1.1 $code");
header("Location: $url");
-
- # Workaround for https://bugs.webkit.org/show_bug.cgi?id=77538
- # Caching redirects results in flakiness in tests that dump loader delegates.
- header("Cache-Control: no-store");
+ addCacheControl();
?>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
