<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191790] branches/safari-601-branch/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191790">191790</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-10-30 09:51:19 -0700 (Fri, 30 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/188366">r188366</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestsresourcesredirectphp">branches/safari-601-branch/LayoutTests/http/tests/resources/redirect.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (191789 => 191790)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-10-30 Lucas Forschler <lforschler@apple.com>
+
+ Merge r188366
+
+ 2015-08-12 Alexey Proskuryakov <ap@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2015-10-29 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191706. rdar://problem/23319292
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsresourcesredirectphp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/http/tests/resources/redirect.php (191789 => 191790)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,20 +1,28 @@
</span><span class="cx"> <?php
</span><ins>+ 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");
+ }
+
</ins><span class="cx"> $url = $_GET['url'];
</span><span class="cx"> $refresh = $_GET['refresh'];
</span><span class="cx">
</span><span class="cx"> if (isset($refresh)) {
</span><span class="cx"> header("HTTP/1.1 200");
</span><span class="cx"> header("Refresh: $refresh; url=$url");
</span><ins>+ addCacheControl();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $code = $_GET['code'];
</span><span class="cx"> if (!isset($code))
</span><del>- $code = 302;
- header("HTTP/1.1 $code");
</del><ins>+ 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");
</ins><span class="cx"> header("Location: $url");
</span><del>-
- # 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");
</del><ins>+ addCacheControl();
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>