<!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>[236039] releases/WebKitGTK/webkit-2.22</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/236039">236039</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2018-09-17 01:49:16 -0700 (Mon, 17 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/235174">r235174</a> - Fetch: Stop checking Request.integrity's value in no-cors mode
https://bugs.webkit.org/show_bug.cgi?id=188802

Patch by Rob Buis <rbuis@igalia.com> on 2018-08-22
Reviewed by Frédéric Wang.

LayoutTests/imported/w3c:

Update integrity.html expected result.

* web-platform-tests/fetch/api/basic/integrity-expected.txt:

Source/WebCore:

Remove this check since it was removed from the spec.

Behavior matches Chrome and Firefox.

Test: http/tests/subresource-integrity/sri-fetch.js:

* Modules/fetch/FetchRequest.cpp:
(WebCore::FetchRequest::initializeOptions):

LayoutTests:

Unskip fetch/api/basic/integrity.html and adjust sri-fetch.js.

* TestExpectations:
* http/tests/subresource-integrity/sri-fetch.js:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit222LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit222LayoutTestsTestExpectations">releases/WebKitGTK/webkit-2.22/LayoutTests/TestExpectations</a></li>
<li><a href="#releasesWebKitGTKwebkit222LayoutTestshttptestssubresourceintegritysrifetchjs">releases/WebKitGTK/webkit-2.22/LayoutTests/http/tests/subresource-integrity/sri-fetch.js</a></li>
<li><a href="#releasesWebKitGTKwebkit222LayoutTestsimportedw3cChangeLog">releases/WebKitGTK/webkit-2.22/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit222LayoutTestsimportedw3cwebplatformtestsfetchapibasicintegrityexpectedtxt">releases/WebKitGTK/webkit-2.22/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/integrity-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreModulesfetchFetchRequestcpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/fetch/FetchRequest.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit222LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog (236038 => 236039)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog     2018-09-17 08:49:07 UTC (rev 236038)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog        2018-09-17 08:49:16 UTC (rev 236039)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2018-08-22  Rob Buis  <rbuis@igalia.com>
+
+        Fetch: Stop checking Request.integrity's value in no-cors mode
+        https://bugs.webkit.org/show_bug.cgi?id=188802
+
+        Reviewed by Frédéric Wang.
+
+        Unskip fetch/api/basic/integrity.html and adjust sri-fetch.js.
+
+        * TestExpectations:
+        * http/tests/subresource-integrity/sri-fetch.js:
+
</ins><span class="cx"> 2018-08-21  Daniel Bates  <dabates@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Disallow navigations when page cache updates the current document of the frame
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222LayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/TestExpectations (236038 => 236039)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/LayoutTests/TestExpectations      2018-09-17 08:49:07 UTC (rev 236038)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/TestExpectations 2018-09-17 08:49:16 UTC (rev 236039)
</span><span class="lines">@@ -707,9 +707,6 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/161312 imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/document-without-browsing-context.html [ Failure Pass ]
</span><span class="cx"> 
</span><del>-webkit.org/b/178241 imported/w3c/web-platform-tests/fetch/api/basic/integrity.html [ Pass Failure ]
-webkit.org/b/178241 imported/w3c/web-platform-tests/fetch/api/basic/integrity-worker.html [ Pass Failure ]
-
</del><span class="cx"> imported/w3c/web-platform-tests/fetch/http-cache/partial.html [ Failure Pass ]
</span><span class="cx"> webkit.org/b/159724 imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-post-upload.htm [ Failure Pass ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222LayoutTestshttptestssubresourceintegritysrifetchjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/http/tests/subresource-integrity/sri-fetch.js (236038 => 236039)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/LayoutTests/http/tests/subresource-integrity/sri-fetch.js 2018-09-17 08:49:07 UTC (rev 236038)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/http/tests/subresource-integrity/sri-fetch.js    2018-09-17 08:49:16 UTC (rev 236039)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> integrity("Ineligible CORS empty integrity", crossorigin_ineligible_resource, { 'integrity': "" }, new TypeError());
</span><span class="cx"> integrity("Ineligible CORS SHA-512 integrity", crossorigin_ineligible_resource, { 'integrity': topSha512 }, new TypeError());
</span><span class="cx"> integrity("Ineligible CORS invalid integrity", crossorigin_ineligible_resource, { 'integrity': invalidSha512 }, new TypeError());
</span><del>-integrity("SHA-256 integrity with 'no-cors' mode", resource, { 'integrity': topSha256, 'mode': 'no-cors' }, new TypeError());
</del><ins>+integrity("SHA-256 integrity with 'no-cors' mode", resource, { 'integrity': topSha256, 'mode': 'no-cors' });
</ins><span class="cx"> integrity("Resource with zero length body", empty_resource, { 'integrity': "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=" });
</span><span class="cx"> 
</span><span class="cx"> done();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222LayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/imported/w3c/ChangeLog (236038 => 236039)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/LayoutTests/imported/w3c/ChangeLog        2018-09-17 08:49:07 UTC (rev 236038)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/imported/w3c/ChangeLog   2018-09-17 08:49:16 UTC (rev 236039)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2018-08-22  Rob Buis  <rbuis@igalia.com>
+
+        Fetch: Stop checking Request.integrity's value in no-cors mode
+        https://bugs.webkit.org/show_bug.cgi?id=188802
+
+        Reviewed by Frédéric Wang.
+
+        Update integrity.html expected result.
+
+        * web-platform-tests/fetch/api/basic/integrity-expected.txt:
+
</ins><span class="cx"> 2018-08-20  Rob Buis  <rbuis@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Throw an exception if window.open() gets passed a URL that cannot be parsed
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222LayoutTestsimportedw3cwebplatformtestsfetchapibasicintegrityexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/integrity-expected.txt (236038 => 236039)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/integrity-expected.txt        2018-09-17 08:49:07 UTC (rev 236038)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/integrity-expected.txt   2018-09-17 08:49:16 UTC (rev 236039)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/top.txt.
</span><span class="cx"> CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/top.txt.
</span><span class="cx"> CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/top.txt?pipe=header(Access-Control-Allow-Origin,*).
</span><ins>+CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/fetch/api/resources/top.txt.
</ins><span class="cx"> 
</span><span class="cx"> PASS Empty string integrity 
</span><span class="cx"> PASS SHA-256 integrity 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (236038 => 236039)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog  2018-09-17 08:49:07 UTC (rev 236038)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog     2018-09-17 08:49:16 UTC (rev 236039)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2018-08-22  Rob Buis  <rbuis@igalia.com>
+
+        Fetch: Stop checking Request.integrity's value in no-cors mode
+        https://bugs.webkit.org/show_bug.cgi?id=188802
+
+        Reviewed by Frédéric Wang.
+
+        Remove this check since it was removed from the spec.
+
+        Behavior matches Chrome and Firefox.
+
+        Test: http/tests/subresource-integrity/sri-fetch.js:
+
+        * Modules/fetch/FetchRequest.cpp:
+        (WebCore::FetchRequest::initializeOptions):
+
</ins><span class="cx"> 2018-08-22  Ms2ger  <Ms2ger@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK] Never return an uninitialized ImageGStreamer object.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreModulesfetchFetchRequestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/fetch/FetchRequest.cpp (236038 => 236039)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/fetch/FetchRequest.cpp     2018-09-17 08:49:07 UTC (rev 236038)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/fetch/FetchRequest.cpp        2018-09-17 08:49:16 UTC (rev 236039)
</span><span class="lines">@@ -134,8 +134,6 @@
</span><span class="cx">         const String& method = m_request.httpMethod();
</span><span class="cx">         if (method != "GET" && method != "POST" && method != "HEAD")
</span><span class="cx">             return Exception { TypeError, "Method must be GET, POST or HEAD in no-cors mode."_s };
</span><del>-        if (!m_options.integrity.isEmpty())
-            return Exception { TypeError, "There cannot be an integrity in no-cors mode."_s };
</del><span class="cx">         m_headers->setGuard(FetchHeaders::Guard::RequestNoCors);
</span><span class="cx">     }
</span><span class="cx">     
</span></span></pre>
</div>
</div>

</body>
</html>