Title: [171025] tags/Safari-538.46.1/Source/WebKit2
Diff
Modified: tags/Safari-538.46.1/Source/WebKit2/ChangeLog (171024 => 171025)
--- tags/Safari-538.46.1/Source/WebKit2/ChangeLog 2014-07-12 18:33:43 UTC (rev 171024)
+++ tags/Safari-538.46.1/Source/WebKit2/ChangeLog 2014-07-12 19:02:47 UTC (rev 171025)
@@ -1,3 +1,21 @@
+2014-07-12 Babak Shafiei <[email protected]>
+
+ Merge r171023
+
+ 2014-07-12 Oliver Hunt <[email protected]>
+
+ Temporary work around for <rdar://<rdar://problem/17513375>
+ https://bugs.webkit.org/show_bug.cgi?id=134848
+
+ Reviewed by Sam Weinig.
+
+ Temporarily work around <rdar://<rdar://problem/17513375> by
+ dropping the explicit cookie storage if it points out of the
+ container.
+
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformDefaultCookieStorageDirectory):
+
2014-07-11 Lucas Forschler <[email protected]>
Merge r171003
Modified: tags/Safari-538.46.1/Source/WebKit2/UIProcess/mac/WebContextMac.mm (171024 => 171025)
--- tags/Safari-538.46.1/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-07-12 18:33:43 UTC (rev 171024)
+++ tags/Safari-538.46.1/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-07-12 19:02:47 UTC (rev 171025)
@@ -276,7 +276,12 @@
path = NSHomeDirectory();
path = path + "/Library/Cookies";
- return stringByResolvingSymlinksInPath(path);
+ path = stringByResolvingSymlinksInPath(path);
+ // Temporary work around for <rdar://<rdar://problem/17513375>
+ if (path == "/var/mobile/Library/Cookies")
+ return String();
+
+ return path;
#else
notImplemented();
return [@"" stringByStandardizingPath];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
