<!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>[286655] 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/286655">286655</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2021-12-08 07:59:47 -0800 (Wed, 08 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Safari Bug "no-cache" network error
https://bugs.webkit.org/show_bug.cgi?id=233916

Reviewed by Chris Dumez.

Source/WebCore:

Test: http/wpt/service-workers/cache-control-request.html

Remove Cache-Control header when going the service worker road if it is added by the network code path and not the application.

* loader/CrossOriginAccessControl.cpp:
(WebCore::httpHeadersToKeepFromCleaning):
(WebCore::cleanHTTPRequestHeadersForAccessControl):
* loader/CrossOriginAccessControl.h:
* platform/network/ResourceRequestBase.cpp:
(WebCore::ResourceRequestBase::removeHTTPHeaderField):
* platform/network/ResourceRequestBase.h:

LayoutTests:

* http/wpt/service-workers/cache-control-request-expected.txt: Added.
* http/wpt/service-workers/cache-control-request-worker.js: Added.
(async doTest):
* http/wpt/service-workers/cache-control-request.html: Added.
* http/wpt/service-workers/resources/cross-origin-allow.py: Added.
(main):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginAccessControlcpp">trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginAccessControlh">trunk/Source/WebCore/loader/CrossOriginAccessControl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBasecpp">trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBaseh">trunk/Source/WebCore/platform/network/ResourceRequestBase.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttpwptserviceworkerscachecontrolrequestexpectedtxt">trunk/LayoutTests/http/wpt/service-workers/cache-control-request-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttpwptserviceworkerscachecontrolrequestworkerjs">trunk/LayoutTests/http/wpt/service-workers/cache-control-request-worker.js</a></li>
<li><a href="#trunkLayoutTestshttpwptserviceworkerscachecontrolrequesthtml">trunk/LayoutTests/http/wpt/service-workers/cache-control-request.html</a></li>
<li><a href="#trunkLayoutTestshttpwptserviceworkersresourcescrossoriginallowpy">trunk/LayoutTests/http/wpt/service-workers/resources/cross-origin-allow.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (286654 => 286655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-12-08 15:34:07 UTC (rev 286654)
+++ trunk/LayoutTests/ChangeLog 2021-12-08 15:59:47 UTC (rev 286655)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-12-08  Youenn Fablet  <youenn@apple.com>
+
+        Safari Bug "no-cache" network error
+        https://bugs.webkit.org/show_bug.cgi?id=233916
+
+        Reviewed by Chris Dumez.
+
+        * http/wpt/service-workers/cache-control-request-expected.txt: Added.
+        * http/wpt/service-workers/cache-control-request-worker.js: Added.
+        (async doTest):
+        * http/wpt/service-workers/cache-control-request.html: Added.
+        * http/wpt/service-workers/resources/cross-origin-allow.py: Added.
+        (main):
+
</ins><span class="cx"> 2021-12-08  Vitaly Dyachkov  <obyknovenius@me.com>
</span><span class="cx"> 
</span><span class="cx">         [css-flexbox] `gap` does not work correctly when `flex-direction: column-reverse` is applied
</span></span></pre></div>
<a id="trunkLayoutTestshttpwptserviceworkerscachecontrolrequestexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/wpt/service-workers/cache-control-request-expected.txt (0 => 286655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/wpt/service-workers/cache-control-request-expected.txt                            (rev 0)
+++ trunk/LayoutTests/http/wpt/service-workers/cache-control-request-expected.txt       2021-12-08 15:59:47 UTC (rev 286655)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+PASS Setup worker
+PASS Ensure cache-control does not break service worker fetch handling
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttpwptserviceworkerscachecontrolrequestworkerjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/wpt/service-workers/cache-control-request-worker.js (0 => 286655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/wpt/service-workers/cache-control-request-worker.js                               (rev 0)
+++ trunk/LayoutTests/http/wpt/service-workers/cache-control-request-worker.js  2021-12-08 15:59:47 UTC (rev 286655)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+async function doTest(event)
+{
+    event.respondWith(fetch(event.request));
+}
+
+self.addEventListener("fetch", doTest);
</ins></span></pre></div>
<a id="trunkLayoutTestshttpwptserviceworkerscachecontrolrequesthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/wpt/service-workers/cache-control-request.html (0 => 286655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/wpt/service-workers/cache-control-request.html                            (rev 0)
+++ trunk/LayoutTests/http/wpt/service-workers/cache-control-request.html       2021-12-08 15:59:47 UTC (rev 286655)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<html>
+<head>
+<title>Service Worker and Cache Control requests</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+</head>
+<body>
+<script>
+promise_test(async (test) => {
+    let registration = await navigator.serviceWorker.getRegistration("resources/");
+    if (registration)
+        await registration.unregister();
+    registration = await navigator.serviceWorker.register("cache-control-request-worker.js", { scope : "resources/" });
+    activeWorker = registration.active;
+    if (activeWorker)
+        return;
+    activeWorker = registration.installing;
+    await new Promise(resolve => {
+        activeWorker.addEventListener('statechange', () => {
+            if (activeWorker.state === "activated")
+                resolve();
+        });
+    });
+}, "Setup worker");
+
+promise_test(async (test) => {
+    const iframe = await with_iframe("resources/empty.html");
+
+    const options = { method: "POST", cache: "no-cache", mode: "cors", body: "body" };
+    const response = await iframe.contentWindow.fetch(get_host_info().HTTP_REMOTE_ORIGIN +  "/WebKit/service-workers/resources/cross-origin-allow.py", options);
+    assert_not_equals(await response.text(), "no cache-control header");
+    iframe.remove();
+}, "Ensure cache-control does not break service worker fetch handling");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttpwptserviceworkersresourcescrossoriginallowpy"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/wpt/service-workers/resources/cross-origin-allow.py (0 => 286655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/wpt/service-workers/resources/cross-origin-allow.py                               (rev 0)
+++ trunk/LayoutTests/http/wpt/service-workers/resources/cross-origin-allow.py  2021-12-08 15:59:47 UTC (rev 286655)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+def main(request, response):
+    value = request.headers.get("Cache-Control", "no cache-control header")
+    return 200, [(b"Content-Type", b"text/ascii"), (b"Access-Control-Allow-Origin", "*")], value
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (286654 => 286655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-08 15:34:07 UTC (rev 286654)
+++ trunk/Source/WebCore/ChangeLog      2021-12-08 15:59:47 UTC (rev 286655)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2021-12-08  Youenn Fablet  <youenn@apple.com>
+
+        Safari Bug "no-cache" network error
+        https://bugs.webkit.org/show_bug.cgi?id=233916
+
+        Reviewed by Chris Dumez.
+
+        Test: http/wpt/service-workers/cache-control-request.html
+
+        Remove Cache-Control header when going the service worker road if it is added by the network code path and not the application.
+
+        * loader/CrossOriginAccessControl.cpp:
+        (WebCore::httpHeadersToKeepFromCleaning):
+        (WebCore::cleanHTTPRequestHeadersForAccessControl):
+        * loader/CrossOriginAccessControl.h:
+        * platform/network/ResourceRequestBase.cpp:
+        (WebCore::ResourceRequestBase::removeHTTPHeaderField):
+        * platform/network/ResourceRequestBase.h:
+
</ins><span class="cx"> 2021-12-08  Vitaly Dyachkov  <obyknovenius@me.com>
</span><span class="cx"> 
</span><span class="cx">         [css-flexbox] `gap` does not work correctly when `flex-direction: column-reverse` is applied
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginAccessControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp (286654 => 286655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2021-12-08 15:34:07 UTC (rev 286654)
+++ trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp    2021-12-08 15:59:47 UTC (rev 286655)
</span><span class="lines">@@ -189,6 +189,8 @@
</span><span class="cx">         headersToKeep.add(HTTPHeadersToKeepFromCleaning::UserAgent);
</span><span class="cx">     if (headers.contains(HTTPHeaderName::AcceptEncoding))
</span><span class="cx">         headersToKeep.add(HTTPHeadersToKeepFromCleaning::AcceptEncoding);
</span><ins>+    if (headers.contains(HTTPHeaderName::CacheControl))
+        headersToKeep.add(HTTPHeadersToKeepFromCleaning::CacheControl);
</ins><span class="cx">     return headersToKeep;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -208,6 +210,8 @@
</span><span class="cx">         request.clearHTTPUserAgent();
</span><span class="cx">     if (!headersToKeep.contains(HTTPHeadersToKeepFromCleaning::AcceptEncoding))
</span><span class="cx">         request.clearHTTPAcceptEncoding();
</span><ins>+    if (!headersToKeep.contains(HTTPHeadersToKeepFromCleaning::CacheControl))
+        request.removeHTTPHeaderField(HTTPHeaderName::CacheControl);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> CrossOriginAccessControlCheckDisabler& CrossOriginAccessControlCheckDisabler::singleton()
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginAccessControlh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.h (286654 => 286655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginAccessControl.h   2021-12-08 15:34:07 UTC (rev 286654)
+++ trunk/Source/WebCore/loader/CrossOriginAccessControl.h      2021-12-08 15:59:47 UTC (rev 286655)
</span><span class="lines">@@ -67,7 +67,8 @@
</span><span class="cx">     Referer = 1 << 1,
</span><span class="cx">     Origin = 1 << 2,
</span><span class="cx">     UserAgent = 1 << 3,
</span><del>-    AcceptEncoding = 1 << 4
</del><ins>+    AcceptEncoding = 1 << 4,
+    CacheControl = 1 << 5
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> OptionSet<HTTPHeadersToKeepFromCleaning> httpHeadersToKeepFromCleaning(const HTTPHeaderMap&);
</span><span class="lines">@@ -102,7 +103,8 @@
</span><span class="cx">         WebCore::HTTPHeadersToKeepFromCleaning::Referer,
</span><span class="cx">         WebCore::HTTPHeadersToKeepFromCleaning::Origin,
</span><span class="cx">         WebCore::HTTPHeadersToKeepFromCleaning::UserAgent,
</span><del>-        WebCore::HTTPHeadersToKeepFromCleaning::AcceptEncoding
</del><ins>+        WebCore::HTTPHeadersToKeepFromCleaning::AcceptEncoding,
+        WebCore::HTTPHeadersToKeepFromCleaning::CacheControl
</ins><span class="cx">     >;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (286654 => 286655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp    2021-12-08 15:34:07 UTC (rev 286654)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp       2021-12-08 15:59:47 UTC (rev 286655)
</span><span class="lines">@@ -610,6 +610,15 @@
</span><span class="cx">     m_platformRequestUpdated = false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void ResourceRequestBase::removeHTTPHeaderField(HTTPHeaderName name)
+{
+    updateResourceRequest();
+
+    m_httpHeaderFields.remove(name);
+
+    m_platformRequestUpdated = false;
+}
+
</ins><span class="cx"> #if USE(SYSTEM_PREVIEW)
</span><span class="cx"> 
</span><span class="cx"> bool ResourceRequestBase::isSystemPreview() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (286654 => 286655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h      2021-12-08 15:34:07 UTC (rev 286654)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2021-12-08 15:59:47 UTC (rev 286655)
</span><span class="lines">@@ -106,6 +106,7 @@
</span><span class="cx">     WEBCORE_EXPORT void addHTTPHeaderField(const String& name, const String& value);
</span><span class="cx">     WEBCORE_EXPORT void addHTTPHeaderFieldIfNotPresent(HTTPHeaderName, const String&);
</span><span class="cx">     void removeHTTPHeaderField(const String& name);
</span><ins>+    void removeHTTPHeaderField(HTTPHeaderName);
</ins><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT bool hasHTTPHeaderField(HTTPHeaderName) const;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>