Diff
Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog (236038 => 236039)
--- 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)
@@ -1,3 +1,15 @@
+2018-08-22 Rob Buis <[email protected]>
+
+ 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:
+
2018-08-21 Daniel Bates <[email protected]>
Disallow navigations when page cache updates the current document of the frame
Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/TestExpectations (236038 => 236039)
--- 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)
@@ -707,9 +707,6 @@
webkit.org/b/161312 imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/document-without-browsing-context.html [ Failure Pass ]
-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 ]
-
imported/w3c/web-platform-tests/fetch/http-cache/partial.html [ Failure Pass ]
webkit.org/b/159724 imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-post-upload.htm [ Failure Pass ]
Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/http/tests/subresource-integrity/sri-fetch.js (236038 => 236039)
--- 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)
@@ -59,7 +59,7 @@
integrity("Ineligible CORS empty integrity", crossorigin_ineligible_resource, { 'integrity': "" }, new TypeError());
integrity("Ineligible CORS SHA-512 integrity", crossorigin_ineligible_resource, { 'integrity': topSha512 }, new TypeError());
integrity("Ineligible CORS invalid integrity", crossorigin_ineligible_resource, { 'integrity': invalidSha512 }, new TypeError());
-integrity("SHA-256 integrity with 'no-cors' mode", resource, { 'integrity': topSha256, 'mode': 'no-cors' }, new TypeError());
+integrity("SHA-256 integrity with 'no-cors' mode", resource, { 'integrity': topSha256, 'mode': 'no-cors' });
integrity("Resource with zero length body", empty_resource, { 'integrity': "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=" });
done();
Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/imported/w3c/ChangeLog (236038 => 236039)
--- 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)
@@ -1,3 +1,14 @@
+2018-08-22 Rob Buis <[email protected]>
+
+ 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:
+
2018-08-20 Rob Buis <[email protected]>
Throw an exception if window.open() gets passed a URL that cannot be parsed
Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/integrity-expected.txt (236038 => 236039)
--- 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)
@@ -2,6 +2,7 @@
CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/top.txt.
CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/top.txt.
CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/top.txt?pipe=header(Access-Control-Allow-Origin,*).
+CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/fetch/api/resources/top.txt.
PASS Empty string integrity
PASS SHA-256 integrity
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (236038 => 236039)
--- 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)
@@ -1,3 +1,19 @@
+2018-08-22 Rob Buis <[email protected]>
+
+ 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):
+
2018-08-22 Ms2ger <[email protected]>
[GTK] Never return an uninitialized ImageGStreamer object.
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/fetch/FetchRequest.cpp (236038 => 236039)
--- 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)
@@ -134,8 +134,6 @@
const String& method = m_request.httpMethod();
if (method != "GET" && method != "POST" && method != "HEAD")
return Exception { TypeError, "Method must be GET, POST or HEAD in no-cors mode."_s };
- if (!m_options.integrity.isEmpty())
- return Exception { TypeError, "There cannot be an integrity in no-cors mode."_s };
m_headers->setGuard(FetchHeaders::Guard::RequestNoCors);
}
