Changeset 202438 in webkit

Timestamp:

Jun 24, 2016 12:26:50 PM (8 years ago)

Author:

commit-queue@webkit.org

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 <​aalavi@apple.com> 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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/mac/CookieJarMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-24  Amir Alavi  <aalavi@apple.com>
+
+        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  <enrica@apple.com>
 

trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm

@@ -48 +48 @@
 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"];