<!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>[190533] tags/Safari-601.3.1</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/190533">190533</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-10-02 17:33:17 -0700 (Fri, 02 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/190418">r190418</a>. rdar://problem/22936771</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari60131LayoutTestsChangeLog">tags/Safari-601.3.1/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari60131SourceWebKit2ChangeLog">tags/Safari-601.3.1/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari60131SourceWebKit2NetworkProcessNetworkResourceLoadercpp">tags/Safari-601.3.1/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari60131LayoutTestshttptestscacheredirectrefererexpectedhtml">tags/Safari-601.3.1/LayoutTests/http/tests/cache/redirect-referer-expected.html</a></li>
<li><a href="#tagsSafari60131LayoutTestshttptestscacheredirectrefererhtml">tags/Safari-601.3.1/LayoutTests/http/tests/cache/redirect-referer.html</a></li>
<li><a href="#tagsSafari60131LayoutTestshttptestscacheresourcesloadandcheckrefererphp">tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/load-and-check-referer.php</a></li>
<li><a href="#tagsSafari60131LayoutTestshttptestscacheresourcespermanentredirectphp">tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/permanent-redirect.php</a></li>
<li><a href="#tagsSafari60131LayoutTestshttptestscacheresourcesredirectrefereriframeexpectedhtml">tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/redirect-referer-iframe-expected.html</a></li>
<li><a href="#tagsSafari60131LayoutTestshttptestscacheresourcesredirectrefereriframehtml">tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/redirect-referer-iframe.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari60131LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.3.1/LayoutTests/ChangeLog (190532 => 190533)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.3.1/LayoutTests/ChangeLog 2015-10-03 00:26:21 UTC (rev 190532)
+++ tags/Safari-601.3.1/LayoutTests/ChangeLog 2015-10-03 00:33:17 UTC (rev 190533)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-10-02 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r190418.
+
+ 2015-10-01 Antti Koivisto <antti@apple.com>
+
+ Network cache: Subresource referer header wrong after cached redirect
+ https://bugs.webkit.org/show_bug.cgi?id=149709
+ rdar://problem/22917174
+
+ Reviewed by Chris Dumez.
+
+ * http/tests/cache/redirect-referer-expected.html: Added.
+ * http/tests/cache/redirect-referer.html: Added.
+ * http/tests/cache/resources/load-and-check-referer.php: Added.
+ * http/tests/cache/resources/permanent-redirect.php: Added.
+ * http/tests/cache/resources/redirect-referer-iframe.html: Added.
+ * http/tests/cache/resources/redirect-referer-iframe-expected.html: Added.
+
</ins><span class="cx"> 2015-09-12 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Re-add Mavericks result with the correct path.
</span></span></pre></div>
<a id="tagsSafari60131LayoutTestshttptestscacheredirectrefererexpectedhtmlfromrev190418trunkLayoutTestshttptestscacheredirectrefererexpectedhtml"></a>
<div class="copfile"><h4>Copied: tags/Safari-601.3.1/LayoutTests/http/tests/cache/redirect-referer-expected.html (from rev 190418, trunk/LayoutTests/http/tests/cache/redirect-referer-expected.html) (0 => 190533)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.3.1/LayoutTests/http/tests/cache/redirect-referer-expected.html (rev 0)
+++ tags/Safari-601.3.1/LayoutTests/http/tests/cache/redirect-referer-expected.html 2015-10-03 00:33:17 UTC (rev 190533)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<iframe src="resources/redirect-referer-iframe-expected.html"></iframe>
+<iframe src="resources/redirect-referer-iframe-expected.html"></iframe>
</ins></span></pre></div>
<a id="tagsSafari60131LayoutTestshttptestscacheredirectrefererhtmlfromrev190418trunkLayoutTestshttptestscacheredirectrefererhtml"></a>
<div class="copfile"><h4>Copied: tags/Safari-601.3.1/LayoutTests/http/tests/cache/redirect-referer.html (from rev 190418, trunk/LayoutTests/http/tests/cache/redirect-referer.html) (0 => 190533)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.3.1/LayoutTests/http/tests/cache/redirect-referer.html (rev 0)
+++ tags/Safari-601.3.1/LayoutTests/http/tests/cache/redirect-referer.html 2015-10-03 00:33:17 UTC (rev 190533)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<body>
+<script>
+var rnd = Math.floor(Math.random() * 1000000000000000);
+var iframeSrc = "resources/permanent-redirect.php?location=redirect-referer-iframe.html&rnd=" + rnd;
+
+var iframe = document.createElement("iframe");
+iframe.src = iframeSrc;
+iframe.onload = function () {
+ if (window.internals)
+ internals.clearMemoryCache();
+ var iframe = document.createElement("iframe");
+ iframe.src = iframeSrc;
+ document.body.appendChild(iframe);
+}
+document.body.appendChild(iframe);
+
+</script>
</ins></span></pre></div>
<a id="tagsSafari60131LayoutTestshttptestscacheresourcesloadandcheckrefererphpfromrev190418trunkLayoutTestshttptestscacheresourcesloadandcheckrefererphp"></a>
<div class="copfile"><h4>Copied: tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/load-and-check-referer.php (from rev 190418, trunk/LayoutTests/http/tests/cache/resources/load-and-check-referer.php) (0 => 190533)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/load-and-check-referer.php (rev 0)
+++ tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/load-and-check-referer.php 2015-10-03 00:33:17 UTC (rev 190533)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<?
+function contentType($path)
+{
+ if (preg_match("/\.html$/", $path))
+ return "text/html";
+ if (preg_match("/\.manifest$/", $path))
+ return "text/cache-manifest";
+ if (preg_match("/\.js$/", $path))
+ return "text/javascript";
+ if (preg_match("/\.xml$/", $path))
+ return "application/xml";
+ if (preg_match("/\.xhtml$/", $path))
+ return "application/xhtml+xml";
+ if (preg_match("/\.svg$/", $path))
+ return "application/svg+xml";
+ if (preg_match("/\.xsl$/", $path))
+ return "application/xslt+xml";
+ if (preg_match("/\.gif$/", $path))
+ return "image/gif";
+ if (preg_match("/\.jpg$/", $path))
+ return "image/jpeg";
+ if (preg_match("/\.png$/", $path))
+ return "image/png";
+ return "text/plain";
+}
+
+$path = $_GET['path'];
+$expectedReferer = $_GET['expected-referer'];
+$referer = $_SERVER["HTTP_REFERER"];
+
+if ($expectedReferer == $referer && file_exists($path)) {
+ header('HTTP/1.1 200 OK');
+ header("Cache-control: no-store");
+ header("Content-Type: " . contentType($path));
+ print file_get_contents($path);
+} else {
+ header('HTTP/1.1 404 Not Found');
+}
+
+?>
</ins></span></pre></div>
<a id="tagsSafari60131LayoutTestshttptestscacheresourcespermanentredirectphpfromrev190418trunkLayoutTestshttptestscacheresourcespermanentredirectphp"></a>
<div class="copfile"><h4>Copied: tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/permanent-redirect.php (from rev 190418, trunk/LayoutTests/http/tests/cache/resources/permanent-redirect.php) (0 => 190533)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/permanent-redirect.php (rev 0)
+++ tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/permanent-redirect.php 2015-10-03 00:33:17 UTC (rev 190533)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?
+$location = $_GET['location'];
+
+header('HTTP/1.1 301 Permanent Redirect');
+header('Location:' . $location);
+?>
</ins></span></pre></div>
<a id="tagsSafari60131LayoutTestshttptestscacheresourcesredirectrefereriframeexpectedhtmlfromrev190418trunkLayoutTestshttptestscacheresourcesredirectrefereriframeexpectedhtml"></a>
<div class="copfile"><h4>Copied: tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/redirect-referer-iframe-expected.html (from rev 190418, trunk/LayoutTests/http/tests/cache/resources/redirect-referer-iframe-expected.html) (0 => 190533)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/redirect-referer-iframe-expected.html (rev 0)
+++ tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/redirect-referer-iframe-expected.html 2015-10-03 00:33:17 UTC (rev 190533)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+<img src="compass-no-cache.jpg">
</ins></span></pre></div>
<a id="tagsSafari60131LayoutTestshttptestscacheresourcesredirectrefereriframehtmlfromrev190418trunkLayoutTestshttptestscacheresourcesredirectrefereriframehtml"></a>
<div class="copfile"><h4>Copied: tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/redirect-referer-iframe.html (from rev 190418, trunk/LayoutTests/http/tests/cache/resources/redirect-referer-iframe.html) (0 => 190533)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/redirect-referer-iframe.html (rev 0)
+++ tags/Safari-601.3.1/LayoutTests/http/tests/cache/resources/redirect-referer-iframe.html 2015-10-03 00:33:17 UTC (rev 190533)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+<img src="load-and-check-referer.php?path=compass-no-cache.jpg&expected-referer=http://127.0.0.1:8000/cache/resources/redirect-referer-iframe.html">
</ins></span></pre></div>
<a id="tagsSafari60131SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.3.1/Source/WebKit2/ChangeLog (190532 => 190533)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.3.1/Source/WebKit2/ChangeLog 2015-10-03 00:26:21 UTC (rev 190532)
+++ tags/Safari-601.3.1/Source/WebKit2/ChangeLog 2015-10-03 00:33:17 UTC (rev 190533)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-10-02 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r190418.
+
+ 2015-10-01 Antti Koivisto <antti@apple.com>
+
+ Network cache: Subresource referer header wrong after cached redirect
+ https://bugs.webkit.org/show_bug.cgi?id=149709
+ rdar://problem/22917174
+
+ Reviewed by Chris Dumez.
+
+ If a main resource is loaded from a cache entry that involved redirects the document
+ will end up setting the Referer-headers of the subresources to the request URL not the redirected URL
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::didRetrieveCacheEntry):
+
+ If a cache entry involved a redirect synthesize a minimal willSendRequest message so that WebCore side
+ runs through the same code paths as when receiving a redirect from network.
+
</ins><span class="cx"> 2015-08-17 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r188365. rdar://problem/22254920
</span></span></pre></div>
<a id="tagsSafari60131SourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.3.1/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (190532 => 190533)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.3.1/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-10-03 00:26:21 UTC (rev 190532)
+++ tags/Safari-601.3.1/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-10-03 00:33:17 UTC (rev 190533)
</span><span class="lines">@@ -554,6 +554,14 @@
</span><span class="cx"> m_synchronousLoadData->response = entry->response();
</span><span class="cx"> sendReplyToSynchronousRequest(*m_synchronousLoadData, entry->buffer());
</span><span class="cx"> } else {
</span><ins>+ if (entry->response().url() != originalRequest().url()) {
+ // This is a cached redirect. Synthesize a minimal redirect so we get things like referer header right.
+ // FIXME: We should cache the actual redirects.
+ ResourceRequest syntheticRedirectRequest(entry->response().url());
+ ResourceResponse syntheticRedirectResponse(originalRequest().url(), { }, 0, { });
+ sendAbortingOnFailure(Messages::WebResourceLoader::WillSendRequest(syntheticRedirectRequest, syntheticRedirectResponse));
+ }
+
</ins><span class="cx"> bool needsContinueDidReceiveResponseMessage = originalRequest().requester() == ResourceRequest::Requester::Main;
</span><span class="cx"> sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponse(entry->response(), needsContinueDidReceiveResponseMessage));
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>