Title: [214053] branches/safari-603.1.30.4-branch/Source/WebCore
- Revision
- 214053
- Author
- matthew_han...@apple.com
- Date
- 2017-03-16 11:18:50 -0700 (Thu, 16 Mar 2017)
Log Message
Roll out r213847 via r214013. rdar://problem/30983702
Modified Paths
Diff
Modified: branches/safari-603.1.30.4-branch/Source/WebCore/ChangeLog (214052 => 214053)
--- branches/safari-603.1.30.4-branch/Source/WebCore/ChangeLog 2017-03-16 18:18:46 UTC (rev 214052)
+++ branches/safari-603.1.30.4-branch/Source/WebCore/ChangeLog 2017-03-16 18:18:50 UTC (rev 214053)
@@ -1,3 +1,7 @@
+2017-03-16 Matthew Hanson <matthew_han...@apple.com>
+
+ Rollout r214013. rdar://problem/30983702
+
2017-03-15 Matthew Hanson <matthew_han...@apple.com>
Merge r213847. rdar://problem/30983702
Modified: branches/safari-603.1.30.4-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (214052 => 214053)
--- branches/safari-603.1.30.4-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2017-03-16 18:18:46 UTC (rev 214052)
+++ branches/safari-603.1.30.4-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2017-03-16 18:18:50 UTC (rev 214053)
@@ -181,23 +181,19 @@
rawCookies.reserveCapacity(count);
for (CFIndex i = 0; i < count; i++) {
- CFHTTPCookieRef cookie = (CFHTTPCookieRef)CFArrayGetValueAtIndex(cookiesCF.get(), i);
- String name = cookieName(cookie).get();
- String value = cookieValue(cookie).get();
- String domain = cookieDomain(cookie).get();
- String path = cookiePath(cookie).get();
+ CFHTTPCookieRef cookie = (CFHTTPCookieRef)CFArrayGetValueAtIndex(cookiesCF.get(), i);
+ String name = cookieName(cookie).get();
+ String value = cookieValue(cookie).get();
+ String domain = cookieDomain(cookie).get();
+ String path = cookiePath(cookie).get();
- double expires = (cookieExpirationTime(cookie) + kCFAbsoluteTimeIntervalSince1970) * 1000;
+ double expires = (cookieExpirationTime(cookie) + kCFAbsoluteTimeIntervalSince1970) * 1000;
- bool httpOnly = CFHTTPCookieIsHTTPOnly(cookie);
- bool secure = CFHTTPCookieIsSecure(cookie);
- bool session = false; // FIXME: Need API for if a cookie is a session cookie.
+ bool httpOnly = CFHTTPCookieIsHTTPOnly(cookie);
+ bool secure = CFHTTPCookieIsSecure(cookie);
+ bool session = false; // FIXME: Need API for if a cookie is a session cookie.
- String comment;
- URL commentURL;
- Vector<uint16_t> ports;
-
- rawCookies.uncheckedAppend(Cookie(name, value, domain, path, expires, httpOnly, secure, session, comment, commentURL, ports));
+ rawCookies.uncheckedAppend(Cookie(name, value, domain, path, expires, httpOnly, secure, session));
}
return true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
