Changeset 76041 in webkit

Timestamp:

Jan 18, 2011 11:15:03 AM (13 years ago)

Author:

Adam Roben

Message:

Call alternate CFHTTPCookie functions if available

Fixes <​http://webkit.org/b/52637> <rdar://problem/8878984>.

Reviewed by Darin Adler.

• platform/network/cf/CookieJarCFNet.cpp: Added soft-linking macros to

pull in the alternate CFHTTPCookie functions.

(WebCore::cookieDomain):
(WebCore::cookieExpirationTime):
(WebCore::cookieName):
(WebCore::cookiePath):
(WebCore::cookieValue):
Added these wrappers around the CFHTTPCookie functions. We call the
alternate functions if they exist, otherwise fall back to the current
functions.

(WebCore::filterCookies):
(WebCore::getRawCookies):
(WebCore::deleteCookie):
Changed to use the wrapper functions.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/CookieJarCFNet.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-18  Adam Roben  <aroben@apple.com>
+
+        Call alternate CFHTTPCookie functions if available
+
+        Fixes <http://webkit.org/b/52637> <rdar://problem/8878984>.
+
+        Reviewed by Darin Adler.
+
+        * platform/network/cf/CookieJarCFNet.cpp: Added soft-linking macros to
+        pull in the alternate CFHTTPCookie functions.
+
+        (WebCore::cookieDomain):
+        (WebCore::cookieExpirationTime):
+        (WebCore::cookieName):
+        (WebCore::cookiePath):
+        (WebCore::cookieValue):
+        Added these wrappers around the CFHTTPCookie functions. We call the
+        alternate functions if they exist, otherwise fall back to the current
+        functions.
+
+        (WebCore::filterCookies):
+        (WebCore::getRawCookies):
+        (WebCore::deleteCookie):
+        Changed to use the wrapper functions.
+
 2011-01-18  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp

@@ -35 +35 @@
 #include "PlatformString.h"
 #include "ResourceHandle.h"
+#include "SoftLinking.h"
 #include <CFNetwork/CFHTTPCookiesPriv.h>
 #include <CoreFoundation/CoreFoundation.h>
@@ -45 +46 @@
 static const CFStringRef s_cookieCF = CFSTR("Cookie");
 
+#ifdef DEBUG_ALL
+SOFT_LINK_DEBUG_LIBRARY(CFNetwork)
+#else
+SOFT_LINK_LIBRARY(CFNetwork)
+#endif
+
+SOFT_LINK_OPTIONAL(CFNetwork, CFHTTPCookieCopyDomain, CFStringRef, __cdecl, (CFHTTPCookieRef))
+SOFT_LINK_OPTIONAL(CFNetwork, CFHTTPCookieGetExpirationTime, CFAbsoluteTime, __cdecl, (CFHTTPCookieRef))
+SOFT_LINK_OPTIONAL(CFNetwork, CFHTTPCookieCopyName, CFStringRef, __cdecl, (CFHTTPCookieRef))
+SOFT_LINK_OPTIONAL(CFNetwork, CFHTTPCookieCopyPath, CFStringRef, __cdecl, (CFHTTPCookieRef))
+SOFT_LINK_OPTIONAL(CFNetwork, CFHTTPCookieCopyValue, CFStringRef, __cdecl, (CFHTTPCookieRef))
+
+static inline RetainPtr<CFStringRef> cookieDomain(CFHTTPCookieRef cookie)
+{
+    if (CFHTTPCookieCopyDomainPtr())
+        return RetainPtr<CFStringRef>(AdoptCF, CFHTTPCookieCopyDomainPtr()(cookie));
+    return CFHTTPCookieGetDomain(cookie);
+}
+
+static inline CFAbsoluteTime cookieExpirationTime(CFHTTPCookieRef cookie)
+{
+    if (CFHTTPCookieGetExpirationTimePtr())
+        return CFHTTPCookieGetExpirationTimePtr()(cookie);
+    return CFDateGetAbsoluteTime(CFHTTPCookieGetExpiratonDate(cookie));
+}
+
+static inline RetainPtr<CFStringRef> cookieName(CFHTTPCookieRef cookie)
+{
+    if (CFHTTPCookieCopyNamePtr())
+        return RetainPtr<CFStringRef>(AdoptCF, CFHTTPCookieCopyNamePtr()(cookie));
+    return CFHTTPCookieGetName(cookie);
+}
+
+static inline RetainPtr<CFStringRef> cookiePath(CFHTTPCookieRef cookie)
+{
+    if (CFHTTPCookieCopyPathPtr())
+        return RetainPtr<CFStringRef>(AdoptCF, CFHTTPCookieCopyPathPtr()(cookie));
+    return CFHTTPCookieGetPath(cookie);
+}
+
+static inline RetainPtr<CFStringRef> cookieValue(CFHTTPCookieRef cookie)
+{
+    if (CFHTTPCookieCopyValuePtr())
+        return RetainPtr<CFStringRef>(AdoptCF, CFHTTPCookieCopyValuePtr()(cookie));
+    return CFHTTPCookieGetValue(cookie);
+}
+
 static RetainPtr<CFArrayRef> filterCookies(CFArrayRef unfilteredCookies)
 {
@@ -56 +104 @@
         // that, but we also need to avoid sending cookies that were previously stored, and
         // there's no harm to doing this check because such a cookie is never valid.
-        if (!CFStringGetLength(CFHTTPCookieGetName(cookie)))
+        if (!CFStringGetLength(cookieName(cookie).get()))
             continue;
 
@@ -148 +196 @@
     for (CFIndex i = 0; i < count; i++) {
        CFHTTPCookieRef cookie = (CFHTTPCookieRef)CFArrayGetValueAtIndex(cookiesCF.get(), i);
-       String name = CFHTTPCookieGetName(cookie);
-       String value = CFHTTPCookieGetValue(cookie);
-       String domain = CFHTTPCookieGetDomain(cookie);
-       String path = CFHTTPCookieGetPath(cookie);
-
-       double expires = (CFDateGetAbsoluteTime(CFHTTPCookieGetExpiratonDate(cookie)) + kCFAbsoluteTimeIntervalSince1970) * 1000;
+       String name = cookieName(cookie).get();
+       String value = cookieValue(cookie).get();
+       String domain = cookieDomain(cookie).get();
+       String path = cookiePath(cookie).get();
+
+       double expires = (cookieExpirationTime(cookie) + kCFAbsoluteTimeIntervalSince1970) * 1000;
 
        bool httpOnly = CFHTTPCookieIsHTTPOnly(cookie);
@@ -179 +227 @@
     for (CFIndex i = 0; i < count; i++) {
         CFHTTPCookieRef cookie = (CFHTTPCookieRef)CFArrayGetValueAtIndex(cookiesCF.get(), i);
-        String cookieName = CFHTTPCookieGetName(cookie);
-        if (cookieName == name) {
+        if (String(cookieName(cookie).get()) == name) {
             CFHTTPCookieStorageDeleteCookie(cookieStorage, cookie);
             break;