Title: [186907] trunk/Source/WebCore
Revision
186907
Author
[email protected]
Date
2015-07-16 13:24:29 -0700 (Thu, 16 Jul 2015)

Log Message

Rolling out part of r186895 until rdar://problem/21861167 is resolved.
https://bugs.webkit.org/show_bug.cgi?id=146976

* platform/network/cf/CookieJarCFNet.cpp:
(WebCore::createCookies): Don’t use this new SPI quite yet.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (186906 => 186907)


--- trunk/Source/WebCore/ChangeLog	2015-07-16 20:19:25 UTC (rev 186906)
+++ trunk/Source/WebCore/ChangeLog	2015-07-16 20:24:29 UTC (rev 186907)
@@ -1,3 +1,11 @@
+2015-07-16  Brady Eidson  <[email protected]>
+
+        Rolling out part of r186895 until rdar://problem/21861167 is resolved.
+        https://bugs.webkit.org/show_bug.cgi?id=146976
+
+        * platform/network/cf/CookieJarCFNet.cpp:
+        (WebCore::createCookies): Don’t use this new SPI quite yet.
+
 2015-07-16  Filip Pizlo  <[email protected]>
 
         Unreviewed, roll out http://trac.webkit.org/changeset/186903. It broke the build.

Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (186906 => 186907)


--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp	2015-07-16 20:19:25 UTC (rev 186906)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp	2015-07-16 20:24:29 UTC (rev 186907)
@@ -115,11 +115,13 @@
 
 static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
 {
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
-    return _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
-#else
+    // 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
+
     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

Reply via email to