<!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>[205081] trunk</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/205081">205081</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-27 11:43:32 -0700 (Sat, 27 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Fetch API] opaqueredirect responses should have their URL set to the original URL
https://bugs.webkit.org/show_bug.cgi?id=161194
Patch by Youenn Fablet <youenn@apple.com> on 2016-08-27
Reviewed by Sam Weinig.
LayoutTests/imported/w3c:
* web-platform-tests/fetch/api/redirect/redirect-mode.html:
* web-platform-tests/fetch/api/redirect/redirect-mode.js:
(redirectMode): Updating test to ease the computation of the absolute URL.
Source/WebCore:
Covered by updated tests.
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::didReceiveResponse):
* loader/SubresourceLoader.cpp: Removing isNull ASSERT since we now set the response URL.
(WebCore::SubresourceLoader::willSendRequestInternal): Setting opaqueredirect response URL to the original URL.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiredirectredirectmodehtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-mode.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiredirectredirectmodejs">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-mode.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (205080 => 205081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-27 18:07:52 UTC (rev 205080)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-27 18:43:32 UTC (rev 205081)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-08-27 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] opaqueredirect responses should have their URL set to the original URL
+ https://bugs.webkit.org/show_bug.cgi?id=161194
+
+ Reviewed by Sam Weinig.
+
+ * web-platform-tests/fetch/api/redirect/redirect-mode.html:
+ * web-platform-tests/fetch/api/redirect/redirect-mode.js:
+ (redirectMode): Updating test to ease the computation of the absolute URL.
+
</ins><span class="cx"> 2016-08-27 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> script.text should behave like script.textContent on setting
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiredirectredirectmodehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-mode.html (205080 => 205081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-mode.html 2016-08-27 18:07:52 UTC (rev 205080)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-mode.html 2016-08-27 18:43:32 UTC (rev 205081)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> <script src="/resources/testharnessreport.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>- <script src="../resources/utils.js"></script>
</del><ins>+ <script src="../resources/get-host-info.sub.js"></script>
</ins><span class="cx"> <script src="redirect-mode.js"></script>
</span><span class="cx"> </body>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiredirectredirectmodejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-mode.js (205080 => 205081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-mode.js 2016-08-27 18:07:52 UTC (rev 205080)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-mode.js 2016-08-27 18:43:32 UTC (rev 205081)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> if (this.document === undefined) {
</span><span class="cx"> importScripts("/resources/testharness.js");
</span><del>- importScripts("../resources/utils.js");
</del><ins>+ importScripts("../resources/get-host-info.sub.js")
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function redirectMode(desc, redirectUrl, redirectLocation, redirectStatus, redirectMode) {
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> assert_equals(resp.status, 0, "Response's status is 0");
</span><span class="cx"> assert_equals(resp.type, "opaqueredirect", "Response's type is opaqueredirect");
</span><span class="cx"> assert_equals(resp.statusText, "", "Response's statusText is \"\"");
</span><ins>+ assert_equals(resp.url, url + urlParameters, "Response URL should be the original one");
</ins><span class="cx"> });
</span><span class="cx"> if (redirectMode === "follow")
</span><span class="cx"> return fetch(url + urlParameters, requestInit).then(function(resp) {
</span><span class="lines">@@ -28,7 +29,7 @@
</span><span class="cx"> }, desc);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-var redirUrl = RESOURCES_DIR + "redirect.py";
</del><ins>+var redirUrl = get_host_info().HTTP_ORIGIN + "/fetch/api/resources/redirect.py";
</ins><span class="cx"> var locationUrl = "top.txt";
</span><span class="cx">
</span><span class="cx"> for (var statusCode of [301, 302, 303, 307, 308]) {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205080 => 205081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-27 18:07:52 UTC (rev 205080)
+++ trunk/Source/WebCore/ChangeLog 2016-08-27 18:43:32 UTC (rev 205081)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-08-27 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] opaqueredirect responses should have their URL set to the original URL
+ https://bugs.webkit.org/show_bug.cgi?id=161194
+
+ Reviewed by Sam Weinig.
+
+ Covered by updated tests.
+
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::didReceiveResponse):
+ * loader/SubresourceLoader.cpp: Removing isNull ASSERT since we now set the response URL.
+ (WebCore::SubresourceLoader::willSendRequestInternal): Setting opaqueredirect response URL to the original URL.
+
</ins><span class="cx"> 2016-08-27 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> script.text should behave like script.textContent on setting
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (205080 => 205081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-08-27 18:07:52 UTC (rev 205080)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-08-27 18:43:32 UTC (rev 205081)
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> if (response.type() == ResourceResponse::Type::Default)
</span><span class="cx"> m_client->didReceiveResponse(identifier, ResourceResponse::filterResponse(response, tainting));
</span><span class="cx"> else {
</span><del>- ASSERT(response.isNull() && response.type() == ResourceResponse::Type::Opaqueredirect);
</del><ins>+ ASSERT(response.type() == ResourceResponse::Type::Opaqueredirect);
</ins><span class="cx"> m_client->didReceiveResponse(identifier, response);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (205080 => 205081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-08-27 18:07:52 UTC (rev 205080)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-08-27 18:43:32 UTC (rev 205081)
</span><span class="lines">@@ -182,6 +182,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceResponse opaqueRedirectedResponse;
</span><ins>+ opaqueRedirectedResponse.setURL(redirectResponse.url());
</ins><span class="cx"> opaqueRedirectedResponse.setType(ResourceResponse::Type::Opaqueredirect);
</span><span class="cx"> m_resource->responseReceived(opaqueRedirectedResponse);
</span><span class="cx"> didFinishLoading(currentTime());
</span></span></pre>
</div>
</div>
</body>
</html>