<!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>[206813] trunk/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/206813">206813</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-05 09:29:37 -0700 (Wed, 05 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][NetworkSession] Ping requests should follow redirects if applicable
https://bugs.webkit.org/show_bug.cgi?id=162580
<rdar://problem/28631274>
Rename test anchor-ping-and-do-not-follow-redirect-when-sending-ping.html to anchor-ping-and-follow-redirect-when-sending-ping.html
to reflect what it is actually testing - that we follow a redirect when sending a ping for a <a ping>.
* http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping-expected.txt: Renamed from LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping-expected.txt.
* http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping.html: Renamed from LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping.html.
* http/tests/navigation/resources/save-ping-and-redirect-to-save-ping.php: Only append the query string
if we have a non-empty query string to avoid appending a superfluous "?" on redirect.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsnavigationresourcessavepingandredirecttosavepingphp">trunk/LayoutTests/http/tests/navigation/resources/save-ping-and-redirect-to-save-ping.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsnavigationpingattributeanchorpingandfollowredirectwhensendingpingexpectedtxt">trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsnavigationpingattributeanchorpingandfollowredirectwhensendingpinghtml">trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsnavigationpingattributeanchorpinganddonotfollowredirectwhensendingpingexpectedtxt">trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsnavigationpingattributeanchorpinganddonotfollowredirectwhensendingpinghtml">trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206812 => 206813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-05 16:09:20 UTC (rev 206812)
+++ trunk/LayoutTests/ChangeLog 2016-10-05 16:29:37 UTC (rev 206813)
</span><span class="lines">@@ -4,6 +4,20 @@
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162580
</span><span class="cx"> <rdar://problem/28631274>
</span><span class="cx">
</span><ins>+ Rename test anchor-ping-and-do-not-follow-redirect-when-sending-ping.html to anchor-ping-and-follow-redirect-when-sending-ping.html
+ to reflect what it is actually testing - that we follow a redirect when sending a ping for a <a ping>.
+
+ * http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping-expected.txt: Renamed from LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping-expected.txt.
+ * http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping.html: Renamed from LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping.html.
+ * http/tests/navigation/resources/save-ping-and-redirect-to-save-ping.php: Only append the query string
+ if we have a non-empty query string to avoid appending a superfluous "?" on redirect.
+
+2016-10-05 Daniel Bates <dabates@apple.com>
+
+ [WK2][NetworkSession] Ping requests should follow redirects if applicable
+ https://bugs.webkit.org/show_bug.cgi?id=162580
+ <rdar://problem/28631274>
+
</ins><span class="cx"> Reviewed by Alex Christensen.
</span><span class="cx">
</span><span class="cx"> Add tests to ensure that we follow redirects for ping requests that are initiated as part
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsnavigationpingattributeanchorpinganddonotfollowredirectwhensendingpingexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping-expected.txt (206812 => 206813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping-expected.txt 2016-10-05 16:09:20 UTC (rev 206812)
+++ trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping-expected.txt 2016-10-05 16:29:37 UTC (rev 206813)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-Ping sent successfully
-CONTENT_TYPE: text/ping
-HTTP_HOST: 127.0.0.1:8000
-HTTP_PING_FROM: http://127.0.0.1:8000/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping.html
-HTTP_PING_TO: javascript:checkPing()
-REQUEST_METHOD: POST
-REQUEST_URI: /navigation/resources/save-Ping.php
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsnavigationpingattributeanchorpinganddonotfollowredirectwhensendingpinghtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping.html (206812 => 206813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping.html 2016-10-05 16:09:20 UTC (rev 206812)
+++ trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping.html 2016-10-05 16:29:37 UTC (rev 206813)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="resources/utilities.js"></script>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
- testRunner.waitUntilDone();
-}
-
-function test()
-{
- clickElement(document.getElementById("a"));
-}
-
-function checkPing()
-{
- function actualCheckPing()
- {
- window.location = "../resources/check-ping.php";
- }
- // We assume that if redirects were followed when saving a ping that they will complete within one second.
- // FIXME: Is there are better way to test that a redirect occurred?
- window.setTimeout(actualCheckPing, 1000);
-}
-
-window.onload = function ()
-{
- clearLastPingResultAndRunTest(test);
-}
-</script>
-</head>
-<body>
-<p>This test PASSED if the filename of the REQUEST_URI in the dumped report is save-Ping.php. Otherwise, it FAIL.</p>
-<a id="a" href="javascript:checkPing()" ping="../resources/save-ping-and-redirect-to-save-ping.php">Navigate and send ping</a>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsnavigationpingattributeanchorpingandfollowredirectwhensendingpingexpectedtxtfromrev206812trunkLayoutTestshttptestsnavigationpingattributeanchorpinganddonotfollowredirectwhensendingpingexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping-expected.txt (from rev 206812, trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping-expected.txt) (0 => 206813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping-expected.txt 2016-10-05 16:29:37 UTC (rev 206813)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+Ping sent successfully
+CONTENT_TYPE: text/ping
+HTTP_HOST: 127.0.0.1:8000
+HTTP_PING_FROM: http://127.0.0.1:8000/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping.html
+HTTP_PING_TO: javascript:checkPing()
+REQUEST_METHOD: POST
+REQUEST_URI: /navigation/resources/save-Ping.php
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsnavigationpingattributeanchorpingandfollowredirectwhensendingpinghtmlfromrev206812trunkLayoutTestshttptestsnavigationpingattributeanchorpinganddonotfollowredirectwhensendingpinghtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping.html (from rev 206812, trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-do-not-follow-redirect-when-sending-ping.html) (0 => 206813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping.html (rev 0)
+++ trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping.html 2016-10-05 16:29:37 UTC (rev 206813)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="resources/utilities.js"></script>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
+ testRunner.waitUntilDone();
+}
+
+function test()
+{
+ clickElement(document.getElementById("a"));
+}
+
+function checkPing()
+{
+ function actualCheckPing()
+ {
+ window.location = "../resources/check-ping.php";
+ }
+ // We assume that if redirects were followed when saving a ping that they will complete within one second.
+ // FIXME: Is there are better way to test that a redirect occurred?
+ window.setTimeout(actualCheckPing, 1000);
+}
+
+window.onload = function ()
+{
+ clearLastPingResultAndRunTest(test);
+}
+</script>
+</head>
+<body>
+<p>This test PASSED if the filename of the REQUEST_URI in the dumped report is save-Ping.php. Otherwise, it FAIL.</p>
+<a id="a" href="javascript:checkPing()" ping="../resources/save-ping-and-redirect-to-save-ping.php">Navigate and send ping</a>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsnavigationresourcessavepingandredirecttosavepingphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/navigation/resources/save-ping-and-redirect-to-save-ping.php (206812 => 206813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/navigation/resources/save-ping-and-redirect-to-save-ping.php 2016-10-05 16:09:20 UTC (rev 206812)
+++ trunk/LayoutTests/http/tests/navigation/resources/save-ping-and-redirect-to-save-ping.php 2016-10-05 16:29:37 UTC (rev 206813)
</span><span class="lines">@@ -5,5 +5,5 @@
</span><span class="cx"> require_once 'save-Ping.php';
</span><span class="cx">
</span><span class="cx"> header('HTTP/1.1 307');
</span><del>-header('Location: save-Ping.php' . (isset($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''));
</del><ins>+header('Location: save-Ping.php' . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''));
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>