Title: [202438] trunk/Source/WebCore
- Revision
- 202438
- Author
- [email protected]
- Date
- 2016-06-24 12:26:50 -0700 (Fri, 24 Jun 2016)
Log Message
Use _CFHTTPCookieStorageGetDefault directly instead of NSHTTPCookieStorage to get default cookie storage
https://bugs.webkit.org/show_bug.cgi?id=159095
rdar://problem/26630073
Patch by Amir Alavi <[email protected]> on 2016-06-24
Reviewed by Brent Fulgham.
No new tests, it isn't possible to test this in a LayoutTest.
* platform/network/mac/CookieJarMac.mm:
(WebCore::httpCookiesForURL): Get a CFHTTPCookieStorageRef when no cookie storage is provided to match the case when cookie storage is provided.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202437 => 202438)
--- trunk/Source/WebCore/ChangeLog 2016-06-24 19:15:38 UTC (rev 202437)
+++ trunk/Source/WebCore/ChangeLog 2016-06-24 19:26:50 UTC (rev 202438)
@@ -1,3 +1,16 @@
+2016-06-24 Amir Alavi <[email protected]>
+
+ Use _CFHTTPCookieStorageGetDefault directly instead of NSHTTPCookieStorage to get default cookie storage
+ https://bugs.webkit.org/show_bug.cgi?id=159095
+ rdar://problem/26630073
+
+ Reviewed by Brent Fulgham.
+
+ No new tests, it isn't possible to test this in a LayoutTest.
+
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::httpCookiesForURL): Get a CFHTTPCookieStorageRef when no cookie storage is provided to match the case when cookie storage is provided.
+
2016-06-24 Enrica Casucci <[email protected]>
Do not use iOS specific telephone detection on macOS.
Modified: trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm (202437 => 202438)
--- trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2016-06-24 19:15:38 UTC (rev 202437)
+++ trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2016-06-24 19:26:50 UTC (rev 202438)
@@ -47,10 +47,8 @@
static NSArray *httpCookiesForURL(CFHTTPCookieStorageRef cookieStorage, NSURL *firstParty, NSURL *url)
{
- if (!cookieStorage) {
- // FIXME: The fallback to NSHTTPCookieStorage should not be present when USE(CFNETWORK) is defined.
- return [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:url];
- }
+ if (!cookieStorage)
+ cookieStorage = _CFHTTPCookieStorageGetDefault(kCFAllocatorDefault);
bool secure = ![[url scheme] caseInsensitiveCompare:@"https"];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
