Diff
Modified: trunk/LayoutTests/ChangeLog (286654 => 286655)
--- trunk/LayoutTests/ChangeLog 2021-12-08 15:34:07 UTC (rev 286654)
+++ trunk/LayoutTests/ChangeLog 2021-12-08 15:59:47 UTC (rev 286655)
@@ -1,3 +1,17 @@
+2021-12-08 Youenn Fablet <[email protected]>
+
+ 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):
+
2021-12-08 Vitaly Dyachkov <[email protected]>
[css-flexbox] `gap` does not work correctly when `flex-direction: column-reverse` is applied
Added: trunk/LayoutTests/http/wpt/service-workers/cache-control-request-expected.txt (0 => 286655)
--- 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)
@@ -0,0 +1,4 @@
+
+PASS Setup worker
+PASS Ensure cache-control does not break service worker fetch handling
+
Added: trunk/LayoutTests/http/wpt/service-workers/cache-control-request-worker.js (0 => 286655)
--- 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)
@@ -0,0 +1,6 @@
+async function doTest(event)
+{
+ event.respondWith(fetch(event.request));
+}
+
+self.addEventListener("fetch", doTest);
Added: trunk/LayoutTests/http/wpt/service-workers/cache-control-request.html (0 => 286655)
--- 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)
@@ -0,0 +1,38 @@
+<html>
+<head>
+<title>Service Worker and Cache Control requests</title>
+<script src=""
+<script src=""
+<script src=""
+<script src=""
+</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>
Added: trunk/LayoutTests/http/wpt/service-workers/resources/cross-origin-allow.py (0 => 286655)
--- 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)
@@ -0,0 +1,3 @@
+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
Modified: trunk/Source/WebCore/ChangeLog (286654 => 286655)
--- 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)
@@ -1,3 +1,22 @@
+2021-12-08 Youenn Fablet <[email protected]>
+
+ 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:
+
2021-12-08 Vitaly Dyachkov <[email protected]>
[css-flexbox] `gap` does not work correctly when `flex-direction: column-reverse` is applied
Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp (286654 => 286655)
--- 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)
@@ -189,6 +189,8 @@
headersToKeep.add(HTTPHeadersToKeepFromCleaning::UserAgent);
if (headers.contains(HTTPHeaderName::AcceptEncoding))
headersToKeep.add(HTTPHeadersToKeepFromCleaning::AcceptEncoding);
+ if (headers.contains(HTTPHeaderName::CacheControl))
+ headersToKeep.add(HTTPHeadersToKeepFromCleaning::CacheControl);
return headersToKeep;
}
@@ -208,6 +210,8 @@
request.clearHTTPUserAgent();
if (!headersToKeep.contains(HTTPHeadersToKeepFromCleaning::AcceptEncoding))
request.clearHTTPAcceptEncoding();
+ if (!headersToKeep.contains(HTTPHeadersToKeepFromCleaning::CacheControl))
+ request.removeHTTPHeaderField(HTTPHeaderName::CacheControl);
}
CrossOriginAccessControlCheckDisabler& CrossOriginAccessControlCheckDisabler::singleton()
Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.h (286654 => 286655)
--- 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)
@@ -67,7 +67,8 @@
Referer = 1 << 1,
Origin = 1 << 2,
UserAgent = 1 << 3,
- AcceptEncoding = 1 << 4
+ AcceptEncoding = 1 << 4,
+ CacheControl = 1 << 5
};
OptionSet<HTTPHeadersToKeepFromCleaning> httpHeadersToKeepFromCleaning(const HTTPHeaderMap&);
@@ -102,7 +103,8 @@
WebCore::HTTPHeadersToKeepFromCleaning::Referer,
WebCore::HTTPHeadersToKeepFromCleaning::Origin,
WebCore::HTTPHeadersToKeepFromCleaning::UserAgent,
- WebCore::HTTPHeadersToKeepFromCleaning::AcceptEncoding
+ WebCore::HTTPHeadersToKeepFromCleaning::AcceptEncoding,
+ WebCore::HTTPHeadersToKeepFromCleaning::CacheControl
>;
};
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (286654 => 286655)
--- 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)
@@ -610,6 +610,15 @@
m_platformRequestUpdated = false;
}
+void ResourceRequestBase::removeHTTPHeaderField(HTTPHeaderName name)
+{
+ updateResourceRequest();
+
+ m_httpHeaderFields.remove(name);
+
+ m_platformRequestUpdated = false;
+}
+
#if USE(SYSTEM_PREVIEW)
bool ResourceRequestBase::isSystemPreview() const
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (286654 => 286655)
--- 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)
@@ -106,6 +106,7 @@
WEBCORE_EXPORT void addHTTPHeaderField(const String& name, const String& value);
WEBCORE_EXPORT void addHTTPHeaderFieldIfNotPresent(HTTPHeaderName, const String&);
void removeHTTPHeaderField(const String& name);
+ void removeHTTPHeaderField(HTTPHeaderName);
WEBCORE_EXPORT bool hasHTTPHeaderField(HTTPHeaderName) const;
