Title: [200124] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 200124
- Author
- [email protected]
- Date
- 2016-04-27 03:02:08 -0700 (Wed, 27 Apr 2016)
Log Message
Unreviewed. Fix compatibility issue with 2.12.1 regarding local storage access from file URLs.
* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::canAccessStorage):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (200123 => 200124)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-27 09:37:40 UTC (rev 200123)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-27 10:02:08 UTC (rev 200124)
@@ -1,3 +1,10 @@
+2016-04-27 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix compatibility issue with 2.12.1 regarding local storage access from file URLs.
+
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::canAccessStorage):
+
2016-04-25 Alberto Garcia <[email protected]>
[GTK] Crashes if DISPLAY is unset
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/SecurityOrigin.cpp (200123 => 200124)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/SecurityOrigin.cpp 2016-04-27 09:37:40 UTC (rev 200123)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/SecurityOrigin.cpp 2016-04-27 10:02:08 UTC (rev 200124)
@@ -375,7 +375,9 @@
if (m_storageBlockingPolicy == BlockAllStorage)
return false;
- if (isLocal() && !m_universalAccess && shouldAllowFromThirdParty != AlwaysAllowFromThirdParty)
+ // We allow access to local storage from file URLs also when allowFileAccessFromFileURLs setting is enabled,
+ // for backwards compatibility only in WebKitGTK+ 2.12 branch, this should not be backported to any other branch, nor trunk.
+ if (isLocal() && !m_universalAccess && m_enforceFilePathSeparation && shouldAllowFromThirdParty != AlwaysAllowFromThirdParty)
return false;
// FIXME: This check should be replaced with an ASSERT once we can guarantee that topOrigin is not null.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
