Title: [227800] branches/safari-605-branch
- Revision
- 227800
- Author
- [email protected]
- Date
- 2018-01-30 10:49:47 -0800 (Tue, 30 Jan 2018)
Log Message
Cherry-pick r227624. rdar://problem/37019501
Modified Paths
Diff
Modified: branches/safari-605-branch/LayoutTests/imported/w3c/ChangeLog (227799 => 227800)
--- branches/safari-605-branch/LayoutTests/imported/w3c/ChangeLog 2018-01-30 18:49:45 UTC (rev 227799)
+++ branches/safari-605-branch/LayoutTests/imported/w3c/ChangeLog 2018-01-30 18:49:47 UTC (rev 227800)
@@ -1,3 +1,19 @@
+2018-01-30 Jason Marcell <[email protected]>
+
+ Cherry-pick r227624. rdar://problem/37019501
+
+ 2018-01-25 Chris Dumez <[email protected]>
+
+ Registering same scope as the script directory without the last slash should fail
+ https://bugs.webkit.org/show_bug.cgi?id=182122
+ <rdar://problem/36877167>
+
+ Reviewed by Youenn Fablet.
+
+ Rebaseline WPT test now that one more check is passing.
+
+ * web-platform-tests/service-workers/service-worker/registration-security-error.https-expected.txt:
+
2018-01-25 Jason Marcell <[email protected]>
Cherry-pick r227612. rdar://problem/36873390
Modified: branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/registration-security-error.https-expected.txt (227799 => 227800)
--- branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/registration-security-error.https-expected.txt 2018-01-30 18:49:45 UTC (rev 227799)
+++ branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/registration-security-error.https-expected.txt 2018-01-30 18:49:47 UTC (rev 227800)
@@ -1,5 +1,5 @@
-FAIL Registering same scope as the script directory without the last slash assert_unreached: Should have rejected: Registering same scope as the script directory without the last slash should fail with SecurityError. Reached unreachable code
+PASS Registering same scope as the script directory without the last slash
PASS Registration scope outside the script directory
PASS Registering scope outside domain
PASS Registering script outside domain
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (227799 => 227800)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-30 18:49:45 UTC (rev 227799)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-30 18:49:47 UTC (rev 227800)
@@ -1,5 +1,24 @@
2018-01-30 Jason Marcell <[email protected]>
+ Cherry-pick r227624. rdar://problem/37019501
+
+ 2018-01-25 Chris Dumez <[email protected]>
+
+ Registering same scope as the script directory without the last slash should fail
+ https://bugs.webkit.org/show_bug.cgi?id=182122
+ <rdar://problem/36877167>
+
+ Reviewed by Youenn Fablet.
+
+ This aligns our behavior with Firefox and Chrome.
+
+ No new tests, rebaselined existing test.
+
+ * workers/service/ServiceWorkerJob.cpp:
+ (WebCore::ServiceWorkerJob::didReceiveResponse):
+
+2018-01-30 Jason Marcell <[email protected]>
+
Cherry-pick r227529. rdar://problem/37019438
2018-01-24 Eric Carlson <[email protected]>
Modified: branches/safari-605-branch/Source/WebCore/workers/service/ServiceWorkerJob.cpp (227799 => 227800)
--- branches/safari-605-branch/Source/WebCore/workers/service/ServiceWorkerJob.cpp 2018-01-30 18:49:45 UTC (rev 227799)
+++ branches/safari-605-branch/Source/WebCore/workers/service/ServiceWorkerJob.cpp 2018-01-30 18:49:47 UTC (rev 227800)
@@ -122,7 +122,7 @@
if (serviceWorkerAllowed.isNull()) {
String path = m_jobData.scriptURL.path();
// Last part of the path is the script's filename.
- maxScopeString = path.substring(0, path.reverseFind('/'));
+ maxScopeString = path.substring(0, path.reverseFind('/') + 1);
} else {
auto maxScope = URL(m_jobData.scriptURL, serviceWorkerAllowed);
maxScopeString = maxScope.path();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
