Title: [186961] trunk/Source/WebCore
- Revision
- 186961
- Author
- [email protected]
- Date
- 2015-07-17 12:00:45 -0700 (Fri, 17 Jul 2015)
Log Message
Rolling r186895 back in, in its entirety.
https://bugs.webkit.org/show_bug.cgi?id=146976
Rubberstamped by Tim Horton.
* platform/network/cf/CookieJarCFNet.cpp:
(WebCore::createCookies): Use new CFNetwork SPI.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (186960 => 186961)
--- trunk/Source/WebCore/ChangeLog 2015-07-17 18:50:11 UTC (rev 186960)
+++ trunk/Source/WebCore/ChangeLog 2015-07-17 19:00:45 UTC (rev 186961)
@@ -1,3 +1,13 @@
+2015-07-17 Brady Eidson <[email protected]>
+
+ Rolling r186895 back in, in its entirety.
+ https://bugs.webkit.org/show_bug.cgi?id=146976
+
+ Rubberstamped by Tim Horton.
+
+ * platform/network/cf/CookieJarCFNet.cpp:
+ (WebCore::createCookies): Use new CFNetwork SPI.
+
2015-07-17 Benjamin Poulain <[email protected]>
[Content Extensions] CSS-display-none rules are not working properly
Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (186960 => 186961)
--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-17 18:50:11 UTC (rev 186960)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-17 19:00:45 UTC (rev 186961)
@@ -115,13 +115,11 @@
static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
{
- // FIXME: There's a bug in this new CFNetwork SPI tracked by rdar://problem/21861167.
- // Once that bug is resolved, restore this conditional:
-//#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
-// return _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
-//#else
-
+#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
