Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (187632 => 187633)
--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-31 01:43:22 UTC (rev 187632)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-31 01:49:35 UTC (rev 187633)
@@ -1,5 +1,9 @@
2015-07-30 Babak Shafiei <bshaf...@apple.com>
+ Roll out r186895.
+
+2015-07-30 Babak Shafiei <bshaf...@apple.com>
+
Roll out r187048.
2015-07-30 Babak Shafiei <bshaf...@apple.com>
Modified: branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (187632 => 187633)
--- branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-31 01:43:22 UTC (rev 187632)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-31 01:49:35 UTC (rev 187633)
@@ -47,12 +47,6 @@
};
#endif
-#ifdef __cplusplus
-extern "C" CFArrayRef _CFHTTPParsedCookiesWithResponseHeaderFields(CFAllocatorRef inAllocator, CFDictionaryRef headerFields, CFURLRef inURL);
-#else
-extern CFArrayRef _CFHTTPParsedCookiesWithResponseHeaderFields(CFAllocatorRef inAllocator, CFDictionaryRef headerFields, CFURLRef inURL);
-#endif
-
namespace WebCore {
static const CFStringRef s_setCookieKeyCF = CFSTR("Set-Cookie");
@@ -118,15 +112,6 @@
#endif
}
-static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
-{
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
- return _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
-#else
- return CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
-#endif
-}
-
void setCookiesFromDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, const String& value)
{
// <rdar://problem/5632883> CFHTTPCookieStorage stores an empty cookie, which would be sent as "Cookie: =".
@@ -145,8 +130,10 @@
(const void**)&s_setCookieKeyCF, (const void**)&cookieStringCF, 1,
&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
- RetainPtr<CFArrayRef> unfilteredCookies = adoptCF(createCookies(headerFieldsCF.get(), urlCF.get()));
- CFHTTPCookieStorageSetCookies(session.cookieStorage().get(), filterCookies(unfilteredCookies.get()).get(), urlCF.get(), firstPartyForCookiesCF.get());
+ RetainPtr<CFArrayRef> cookiesCF = adoptCF(CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault,
+ headerFieldsCF.get(), urlCF.get()));
+
+ CFHTTPCookieStorageSetCookies(session.cookieStorage().get(), filterCookies(cookiesCF.get()).get(), urlCF.get(), firstPartyForCookiesCF.get());
}
String cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
