Title: [187057] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187057
- Author
- matthew_han...@apple.com
- Date
- 2015-07-20 21:36:37 -0700 (Mon, 20 Jul 2015)
Log Message
Merge r186863. rdar://problem/21715050
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187056 => 187057)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:36:34 UTC (rev 187056)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:36:37 UTC (rev 187057)
@@ -1,5 +1,19 @@
2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186863. rdar://problem/21715050
+
+ 2015-07-15 Brady Eidson <beid...@apple.com>
+
+ WebKit document.cookie mis-parsing.
+ rdar://problem/21715050 and https://bugs.webkit.org/show_bug.cgi?id=146976
+
+ Reviewed by Sam Weinig.
+
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::setCookiesFromDOM): Use new CFNetwork SPI when available.
+
+2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186858. rdar://problem/21643094
2015-07-15 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm (187056 => 187057)
--- branches/safari-601.1-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm 2015-07-21 04:36:34 UTC (rev 187056)
+++ branches/safari-601.1-branch/Source/WebCore/platform/network/mac/CookieJarMac.mm 2015-07-21 04:36:37 UTC (rev 187057)
@@ -118,7 +118,18 @@
String cookieString = cookieStr.contains('=') ? cookieStr : cookieStr + "=";
NSURL *cookieURL = url;
- RetainPtr<NSArray> filteredCookies = filterCookies([NSHTTPCookie cookiesWithResponseHeaderFields:[NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"] forURL:cookieURL]);
+ 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);
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
