Title: [187628] branches/safari-600.8-branch/Source/WebCore
- Revision
- 187628
- Author
- bshaf...@apple.com
- Date
- 2015-07-30 17:37:38 -0700 (Thu, 30 Jul 2015)
Log Message
Roll out r186863. rdar://problem/21714843
Modified Paths
Diff
Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (187627 => 187628)
--- branches/safari-600.8-branch/Source/WebCore/ChangeLog 2015-07-31 00:17:28 UTC (rev 187627)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog 2015-07-31 00:37:38 UTC (rev 187628)
@@ -1,3 +1,7 @@
+2015-07-30 Babak Shafiei <bshaf...@apple.com>
+
+ Roll out r186863.
+
2015-07-29 Babak Shafiei <bshaf...@apple.com>
Roll out r185848.
Modified: branches/safari-600.8-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm (187627 => 187628)
--- branches/safari-600.8-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm 2015-07-31 00:17:28 UTC (rev 187627)
+++ branches/safari-600.8-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm 2015-07-31 00:37:38 UTC (rev 187628)
@@ -105,18 +105,7 @@
String cookieString = cookieStr.contains('=') ? cookieStr : cookieStr + "=";
NSURL *cookieURL = url;
- NSDictionary *headerFields = [NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"];
-
- NSArray *unfilteredCookies;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundeclared-selector"
- if ([[NSHTTPCookie class] respondsToSelector:@selector(_parsedCookiesWithResponseHeaderFields:forURL:)])
- unfilteredCookies = [NSHTTPCookie performSelector:@selector(_parsedCookiesWithResponseHeaderFields:forURL:) withObject:headerFields withObject:cookieURL];
-#pragma clang diagnostic pop
- else
- unfilteredCookies = [NSHTTPCookie cookiesWithResponseHeaderFields:headerFields forURL:cookieURL];
-
- RetainPtr<NSArray> filteredCookies = filterCookies(unfilteredCookies);
+ RetainPtr<NSArray> filteredCookies = filterCookies([NSHTTPCookie cookiesWithResponseHeaderFields:[NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"] forURL:cookieURL]);
ASSERT([filteredCookies.get() count] <= 1);
wkSetHTTPCookiesForURL(session.cookieStorage().get(), filteredCookies.get(), cookieURL, firstParty);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
