<!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>[214818] releases/WebKitGTK/webkit-2.16</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/214818">214818</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-03 10:40:06 -0700 (Mon, 03 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/214807">r214807</a> - [SOUP] URI Fragment is lost after redirect
https://bugs.webkit.org/show_bug.cgi?id=170058
Reviewed by Michael Catanzaro.
Source/WebKit2:
In case of redirection check if the current request has a fragment identifier and apply it to the redirection
only when it doesn't have a fragment identifier yet.
* NetworkProcess/soup/NetworkDataTaskSoup.cpp:
(WebKit::NetworkDataTaskSoup::NetworkDataTaskSoup):
(WebKit::NetworkDataTaskSoup::createRequest):
(WebKit::NetworkDataTaskSoup::continueHTTPRedirection):
* NetworkProcess/soup/NetworkDataTaskSoup.h:
LayoutTests:
Add tests to check we correctly handle fragment identifiers on server redirections.
* http/tests/navigation/redirect-preserves-fragment-expected.txt: Added.
* http/tests/navigation/redirect-preserves-fragment.html: Added.
* http/tests/navigation/redirect-to-fragment-expected.txt: Added.
* http/tests/navigation/redirect-to-fragment.html: Added.
* http/tests/navigation/redirect-to-fragment2-expected.txt: Added.
* http/tests/navigation/redirect-to-fragment2.html: Added.
* http/tests/navigation/resources/redirect-preserves-fragment.php: Added.
* http/tests/navigation/resources/redirect-to-fragment.php: Added.
* http/tests/navigation/resources/redirect-to-fragment2.php: Added.
* platform/ios/TestExpectations:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2NetworkProcesssoupNetworkDataTaskSoupcpp">releases/WebKitGTK/webkit-2.16/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2NetworkProcesssoupNetworkDataTaskSouph">releases/WebKitGTK/webkit-2.16/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationredirectpreservesfragmentexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-preserves-fragment-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationredirectpreservesfragmenthtml">releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-preserves-fragment.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationredirecttofragmentexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationredirecttofragmenthtml">releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationredirecttofragment2expectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment2-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationredirecttofragment2html">releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment2.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationresourcesredirectpreservesfragmentphp">releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/resources/redirect-preserves-fragment.php</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationresourcesredirecttofragmentphp">releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/resources/redirect-to-fragment.php</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationresourcesredirecttofragment2php">releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/resources/redirect-to-fragment2.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (214817 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-04-03 17:38:19 UTC (rev 214817)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-04-03 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] URI Fragment is lost after redirect
+ https://bugs.webkit.org/show_bug.cgi?id=170058
+
+ Reviewed by Michael Catanzaro.
+
+ Add tests to check we correctly handle fragment identifiers on server redirections.
+
+ * http/tests/navigation/redirect-preserves-fragment-expected.txt: Added.
+ * http/tests/navigation/redirect-preserves-fragment.html: Added.
+ * http/tests/navigation/redirect-to-fragment-expected.txt: Added.
+ * http/tests/navigation/redirect-to-fragment.html: Added.
+ * http/tests/navigation/redirect-to-fragment2-expected.txt: Added.
+ * http/tests/navigation/redirect-to-fragment2.html: Added.
+ * http/tests/navigation/resources/redirect-preserves-fragment.php: Added.
+ * http/tests/navigation/resources/redirect-to-fragment.php: Added.
+ * http/tests/navigation/resources/redirect-to-fragment2.php: Added.
+ * platform/ios/TestExpectations:
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2017-03-30 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Crash] WebCore::AudioBuffer::AudioBuffer don't checking illegal value
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationredirectpreservesfragmentexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-preserves-fragment-expected.txt (0 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-preserves-fragment-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-preserves-fragment-expected.txt 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+http://127.0.0.1:8000/navigation/resources/redirect-preserves-fragment.php#foo - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/redirect-preserves-fragment.php#foo, main document URL http://127.0.0.1:8000/navigation/redirect-preserves-fragment.html, http method GET> redirectResponse (null)
+http://127.0.0.1:8000/navigation/redirect-preserves-fragment.html - didFinishLoading
+http://127.0.0.1:8000/navigation/resources/redirect-preserves-fragment.php#foo - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/success.html#foo, main document URL http://127.0.0.1:8000/navigation/redirect-preserves-fragment.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/navigation/resources/redirect-preserves-fragment.php#foo, http status code 302>
+http://127.0.0.1:8000/navigation/resources/redirect-preserves-fragment.php#foo - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/navigation/resources/success.html#foo, http status code 200>
+Test passes if WebKit preserves the request fragment identifier after the redirection.
+
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationredirectpreservesfragmenthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-preserves-fragment.html (0 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-preserves-fragment.html (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-preserves-fragment.html 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpResourceLoadCallbacks();
+ testRunner.waitUntilDone();
+}
+
+onload = function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+</script>
+</head>
+<body>
+<p>Test passes if WebKit preserves the request fragment identifier after the redirection.</p>
+<iframe src="resources/redirect-preserves-fragment.php#foo"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationredirecttofragmentexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment-expected.txt (0 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment-expected.txt 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+http://127.0.0.1:8000/navigation/resources/redirect-to-fragment.php#foo - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/redirect-to-fragment.php#foo, main document URL http://127.0.0.1:8000/navigation/redirect-to-fragment.html, http method GET> redirectResponse (null)
+http://127.0.0.1:8000/navigation/redirect-to-fragment.html - didFinishLoading
+http://127.0.0.1:8000/navigation/resources/redirect-to-fragment.php#foo - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/success.html#bar, main document URL http://127.0.0.1:8000/navigation/redirect-to-fragment.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/navigation/resources/redirect-to-fragment.php#foo, http status code 302>
+http://127.0.0.1:8000/navigation/resources/redirect-to-fragment.php#foo - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/navigation/resources/success.html#bar, http status code 200>
+Test passes if WebKit ignores the request fragment identifier after the redirect to a url with a fragment identifier.
+
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationredirecttofragmenthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment.html (0 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment.html (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment.html 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpResourceLoadCallbacks();
+ testRunner.waitUntilDone();
+}
+
+onload = function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+</script>
+</head>
+<body>
+<p>Test passes if WebKit ignores the request fragment identifier after the redirect to a url with a fragment identifier.</p>
+<iframe src="resources/redirect-to-fragment.php#foo"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationredirecttofragment2expectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment2-expected.txt (0 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment2-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment2-expected.txt 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+http://127.0.0.1:8000/navigation/resources/redirect-to-fragment2.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/redirect-to-fragment2.php, main document URL http://127.0.0.1:8000/navigation/redirect-to-fragment2.html, http method GET> redirectResponse (null)
+http://127.0.0.1:8000/navigation/redirect-to-fragment2.html - didFinishLoading
+http://127.0.0.1:8000/navigation/resources/redirect-to-fragment2.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/redirect-preserves-fragment.php#bar, main document URL http://127.0.0.1:8000/navigation/redirect-to-fragment2.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/navigation/resources/redirect-to-fragment2.php, http status code 302>
+http://127.0.0.1:8000/navigation/resources/redirect-to-fragment2.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/success.html#bar, main document URL http://127.0.0.1:8000/navigation/redirect-to-fragment2.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/navigation/resources/redirect-preserves-fragment.php#bar, http status code 302>
+http://127.0.0.1:8000/navigation/resources/redirect-to-fragment2.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/navigation/resources/success.html#bar, http status code 200>
+Test passes if WebKit keeps fragment identifier from first redirected URL.
+
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationredirecttofragment2html"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment2.html (0 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment2.html (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/redirect-to-fragment2.html 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpResourceLoadCallbacks();
+ testRunner.waitUntilDone();
+}
+
+onload = function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+</script>
+</head>
+<body>
+<p>Test passes if WebKit keeps fragment identifier from first redirected URL.</p>
+<iframe src="resources/redirect-to-fragment2.php"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationresourcesredirectpreservesfragmentphp"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/resources/redirect-preserves-fragment.php (0 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/resources/redirect-preserves-fragment.php (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/resources/redirect-preserves-fragment.php 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?php
+header('Location: success.html');
+?>
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationresourcesredirecttofragmentphp"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/resources/redirect-to-fragment.php (0 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/resources/redirect-to-fragment.php (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/resources/redirect-to-fragment.php 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?php
+header('Location: success.html#bar');
+?>
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestshttptestsnavigationresourcesredirecttofragment2php"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/resources/redirect-to-fragment2.php (0 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/resources/redirect-to-fragment2.php (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/http/tests/navigation/resources/redirect-to-fragment2.php 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?php
+header('Location: redirect-preserves-fragment.php#bar');
+?>
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog (214817 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-04-03 17:38:19 UTC (rev 214817)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-04-03 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] URI Fragment is lost after redirect
+ https://bugs.webkit.org/show_bug.cgi?id=170058
+
+ Reviewed by Michael Catanzaro.
+
+ In case of redirection check if the current request has a fragment identifier and apply it to the redirection
+ only when it doesn't have a fragment identifier yet.
+
+ * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+ (WebKit::NetworkDataTaskSoup::NetworkDataTaskSoup):
+ (WebKit::NetworkDataTaskSoup::createRequest):
+ (WebKit::NetworkDataTaskSoup::continueHTTPRedirection):
+ * NetworkProcess/soup/NetworkDataTaskSoup.h:
+
</ins><span class="cx"> 2017-03-31 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Modern media controls should never be enabled in non cocoa ports
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebKit2NetworkProcesssoupNetworkDataTaskSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.cpp (214817 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2017-04-03 17:38:19 UTC (rev 214817)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> }
</span><span class="cx"> applyAuthenticationToRequest(request);
</span><span class="cx"> }
</span><del>- createRequest(request);
</del><ins>+ createRequest(WTFMove(request));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetworkDataTaskSoup::~NetworkDataTaskSoup()
</span><span class="lines">@@ -102,9 +102,11 @@
</span><span class="cx"> m_allowOverwriteDownload = allowOverwrite;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkDataTaskSoup::createRequest(const ResourceRequest& request)
</del><ins>+void NetworkDataTaskSoup::createRequest(ResourceRequest&& request)
</ins><span class="cx"> {
</span><del>- GUniquePtr<SoupURI> soupURI = request.createSoupURI();
</del><ins>+ m_currentRequest = WTFMove(request);
+
+ GUniquePtr<SoupURI> soupURI = m_currentRequest.createSoupURI();
</ins><span class="cx"> if (!soupURI) {
</span><span class="cx"> scheduleFailure(InvalidURLFailure);
</span><span class="cx"> return;
</span><span class="lines">@@ -116,9 +118,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- request.updateSoupRequest(soupRequest.get());
</del><ins>+ m_currentRequest.updateSoupRequest(soupRequest.get());
</ins><span class="cx">
</span><del>- if (!request.url().protocolIsInHTTPFamily()) {
</del><ins>+ if (!m_currentRequest.url().protocolIsInHTTPFamily()) {
</ins><span class="cx"> m_soupRequest = WTFMove(soupRequest);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -132,7 +134,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned messageFlags = SOUP_MESSAGE_NO_REDIRECT;
</span><span class="cx">
</span><del>- request.updateSoupMessage(soupMessage.get());
</del><ins>+ m_currentRequest.updateSoupMessage(soupMessage.get());
</ins><span class="cx"> if (m_shouldContentSniff == DoNotSniffContent)
</span><span class="cx"> soup_message_disable_feature(soupMessage.get(), SOUP_TYPE_CONTENT_SNIFFER);
</span><span class="cx"> if (m_user.isEmpty() && m_password.isEmpty() && m_storedCredentials == DoNotAllowStoredCredentials) {
</span><span class="lines">@@ -158,7 +160,7 @@
</span><span class="cx"> soup_message_set_flags(soupMessage.get(), static_cast<SoupMessageFlags>(soup_message_get_flags(soupMessage.get()) | messageFlags));
</span><span class="cx">
</span><span class="cx"> #if SOUP_CHECK_VERSION(2, 43, 1)
</span><del>- soup_message_set_priority(soupMessage.get(), toSoupMessagePriority(request.priority()));
</del><ins>+ soup_message_set_priority(soupMessage.get(), toSoupMessagePriority(m_currentRequest.priority()));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_soupRequest = WTFMove(soupRequest);
</span><span class="lines">@@ -613,14 +615,17 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ResourceRequest request = m_firstRequest;
- request.setURL(URL(m_response.url(), m_response.httpHeaderField(HTTPHeaderName::Location)));
</del><ins>+ ResourceRequest request = m_currentRequest;
+ URL redirectedURL = URL(m_response.url(), m_response.httpHeaderField(HTTPHeaderName::Location));
+ if (!redirectedURL.hasFragmentIdentifier() && request.url().hasFragmentIdentifier())
+ redirectedURL.setFragmentIdentifier(request.url().fragmentIdentifier());
+ request.setURL(redirectedURL);
</ins><span class="cx">
</span><span class="cx"> // Should not set Referer after a redirect from a secure resource to non-secure one.
</span><span class="cx"> if (m_shouldClearReferrerOnHTTPSToHTTPRedirect && !request.url().protocolIs("https") && protocolIs(request.httpReferrer(), "https"))
</span><span class="cx"> request.clearHTTPReferrer();
</span><span class="cx">
</span><del>- bool isCrossOrigin = !protocolHostAndPortAreEqual(m_firstRequest.url(), request.url());
</del><ins>+ bool isCrossOrigin = !protocolHostAndPortAreEqual(m_currentRequest.url(), request.url());
</ins><span class="cx"> if (!equalLettersIgnoringASCIICase(request.httpMethod(), "get")) {
</span><span class="cx"> // Change newRequest method to GET if change was made during a previous redirection or if current redirection says so.
</span><span class="cx"> if (m_soupMessage->method == SOUP_METHOD_GET || !request.url().protocolIsInHTTPFamily() || shouldRedirectAsGET(m_soupMessage.get(), isCrossOrigin)) {
</span><span class="lines">@@ -664,7 +669,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> applyAuthenticationToRequest(request);
</span><span class="cx"> }
</span><del>- createRequest(request);
</del><ins>+ createRequest(WTFMove(request));
</ins><span class="cx"> if (m_soupRequest && m_state != State::Suspended) {
</span><span class="cx"> m_state = State::Suspended;
</span><span class="cx"> resume();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebKit2NetworkProcesssoupNetworkDataTaskSouph"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.h (214817 => 214818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.h 2017-04-03 17:38:19 UTC (rev 214817)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.h 2017-04-03 17:40:06 UTC (rev 214818)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> void startTimeout();
</span><span class="cx"> void stopTimeout();
</span><span class="cx">
</span><del>- void createRequest(const WebCore::ResourceRequest&);
</del><ins>+ void createRequest(WebCore::ResourceRequest&&);
</ins><span class="cx"> void clearRequest();
</span><span class="cx"> static void sendRequestCallback(SoupRequest*, GAsyncResult*, NetworkDataTaskSoup*);
</span><span class="cx"> void didSendRequest(GRefPtr<GInputStream>&&);
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx"> GRefPtr<GAsyncResult> m_pendingResult;
</span><span class="cx"> WebCore::ProtectionSpace m_protectionSpaceForPersistentStorage;
</span><span class="cx"> WebCore::Credential m_credentialForPersistentStorage;
</span><ins>+ WebCore::ResourceRequest m_currentRequest;
</ins><span class="cx"> WebCore::ResourceResponse m_response;
</span><span class="cx"> Vector<char> m_readBuffer;
</span><span class="cx"> unsigned m_redirectCount { 0 };
</span></span></pre>
</div>
</div>
</body>
</html>