Title: [187631] branches/safari-600.1.4.17-branch/Source/WebCore
- Revision
- 187631
- Author
- bshaf...@apple.com
- Date
- 2015-07-30 18:40:13 -0700 (Thu, 30 Jul 2015)
Log Message
Roll out r187490. rdar://problem/22035036
Modified Paths
Diff
Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (187630 => 187631)
--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-31 00:52:45 UTC (rev 187630)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-31 01:40:13 UTC (rev 187631)
@@ -1,5 +1,9 @@
2015-07-29 Babak Shafiei <bshaf...@apple.com>
+ Roll out r187490.
+
+2015-07-29 Babak Shafiei <bshaf...@apple.com>
+
Roll out r185848.
2015-07-28 Babak Shafiei <bshaf...@apple.com>
Modified: branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (187630 => 187631)
--- branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-31 00:52:45 UTC (rev 187630)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-31 01:40:13 UTC (rev 187631)
@@ -85,7 +85,6 @@
static RetainPtr<CFArrayRef> filterCookies(CFArrayRef unfilteredCookies)
{
- ASSERT(unfilteredCookies);
CFIndex count = CFArrayGetCount(unfilteredCookies);
RetainPtr<CFMutableArrayRef> filteredCookies = adoptCF(CFArrayCreateMutable(0, count, &kCFTypeArrayCallBacks));
for (CFIndex i = 0; i < count; ++i) {
@@ -121,11 +120,7 @@
static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
{
- CFArrayRef parsedCookies = _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
- if (!parsedCookies)
- parsedCookies = CFArrayCreate(kCFAllocatorDefault, 0, 0, &kCFTypeArrayCallBacks);
-
- return parsedCookies;
+ return _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
}
void setCookiesFromDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, const String& value)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
