Title: [187632] branches/safari-600.1.4.17-branch/Source/WebCore
- Revision
- 187632
- Author
- [email protected]
- Date
- 2015-07-30 18:43:22 -0700 (Thu, 30 Jul 2015)
Log Message
Roll out r187048. rdar://problem/21714851
Modified Paths
Diff
Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (187631 => 187632)
--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-31 01:40:13 UTC (rev 187631)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-31 01:43:22 UTC (rev 187632)
@@ -1,5 +1,9 @@
-2015-07-29 Babak Shafiei <[email protected]>
+2015-07-30 Babak Shafiei <[email protected]>
+ Roll out r187048.
+
+2015-07-30 Babak Shafiei <[email protected]>
+
Roll out r187490.
2015-07-29 Babak Shafiei <[email protected]>
Modified: branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (187631 => 187632)
--- branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-31 01:40:13 UTC (rev 187631)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-31 01:43:22 UTC (rev 187632)
@@ -120,7 +120,11 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
