Title: [210908] branches/safari-603-branch/Source/WebCore
- Revision
- 210908
- Author
- [email protected]
- Date
- 2017-01-18 19:07:09 -0800 (Wed, 18 Jan 2017)
Log Message
Merge r210888. rdar://problem/30068195
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210907 => 210908)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-19 03:07:07 UTC (rev 210907)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-19 03:07:09 UTC (rev 210908)
@@ -1,5 +1,22 @@
2017-01-18 Matthew Hanson <[email protected]>
+ Merge r210888. rdar://problem/30068195
+
+ 2017-01-18 Michael Catanzaro <[email protected]>
+
+ REGRESSION(r210531): Broke local resource loads from custom local protocols
+ https://bugs.webkit.org/show_bug.cgi?id=167058
+
+ Reviewed by Brent Fulgham.
+
+ Allow local protocols to access resources on different volumes unless the protocol is
+ "file".
+
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::canDisplay):
+
+2017-01-18 Matthew Hanson <[email protected]>
+
Merge r210862. rdar://problem/30055009
2017-01-18 Youenn Fablet <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/page/SecurityOrigin.cpp (210907 => 210908)
--- branches/safari-603-branch/Source/WebCore/page/SecurityOrigin.cpp 2017-01-19 03:07:07 UTC (rev 210907)
+++ branches/safari-603-branch/Source/WebCore/page/SecurityOrigin.cpp 2017-01-19 03:07:09 UTC (rev 210908)
@@ -304,10 +304,8 @@
if (m_universalAccess)
return true;
- if (isLocal() && url.isLocalFile()) {
- if (!filesHaveSameVolume(m_filePath, url.path()))
- return false;
- }
+ if (m_protocol == "file" && url.isLocalFile() && !filesHaveSameVolume(m_filePath, url.path()))
+ return false;
if (isFeedWithNestedProtocolInHTTPFamily(url))
return true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
