<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213778] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213778">213778</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2017-03-12 18:54:16 -0700 (Sun, 12 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add full NSHTTPCookie fidelity to WebCore::Cookie.
https://bugs.webkit.org/show_bug.cgi?id=169514
Reviewed by Dean Jackson.
No new tests (Refactor, no testable behavior change for now).
* platform/Cookie.h:
(WebCore::Cookie::Cookie):
(WebCore::Cookie::encode):
(WebCore::Cookie::decode):
* platform/network/cocoa/CookieCocoa.mm:
(WebCore::portVectorFromList):
(WebCore::portStringFromVector):
(WebCore::Cookie::Cookie):
(WebCore::Cookie::operator NSHTTPCookie *):
* platform/network/mac/CookieJarMac.mm:
(WebCore::getRawCookies):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformCookieh">trunk/Source/WebCore/platform/Cookie.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaCookieCocoamm">trunk/Source/WebCore/platform/network/cocoa/CookieCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacCookieJarMacmm">trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213777 => 213778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-13 01:37:36 UTC (rev 213777)
+++ trunk/Source/WebCore/ChangeLog 2017-03-13 01:54:16 UTC (rev 213778)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-03-12 Brady Eidson <beidson@apple.com>
+
+ Add full NSHTTPCookie fidelity to WebCore::Cookie.
+ https://bugs.webkit.org/show_bug.cgi?id=169514
+
+ Reviewed by Dean Jackson.
+
+ No new tests (Refactor, no testable behavior change for now).
+
+ * platform/Cookie.h:
+ (WebCore::Cookie::Cookie):
+ (WebCore::Cookie::encode):
+ (WebCore::Cookie::decode):
+
+ * platform/network/cocoa/CookieCocoa.mm:
+ (WebCore::portVectorFromList):
+ (WebCore::portStringFromVector):
+ (WebCore::Cookie::Cookie):
+ (WebCore::Cookie::operator NSHTTPCookie *):
+
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::getRawCookies):
+
</ins><span class="cx"> 2017-03-12 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r213764): Async image decoding is disabled for animated images
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCookieh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Cookie.h (213777 => 213778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Cookie.h 2017-03-13 01:37:36 UTC (rev 213777)
+++ trunk/Source/WebCore/platform/Cookie.h 2017-03-13 01:54:16 UTC (rev 213778)
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef Cookie_h
-#define Cookie_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><ins>+#include "URL.h"
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> struct Cookie {
</span><span class="cx"> Cookie() { }
</span><span class="cx">
</span><del>- Cookie(const String& name, const String& value, const String& domain, const String& path, double expires, bool httpOnly, bool secure, bool session)
</del><ins>+ Cookie(const String& name, const String& value, const String& domain, const String& path, double expires, bool httpOnly, bool secure, bool session, const String& comment, const URL& commentURL, const Vector<uint16_t> ports)
</ins><span class="cx"> : name(name)
</span><span class="cx"> , value(value)
</span><span class="cx"> , domain(domain)
</span><span class="lines">@@ -47,6 +47,9 @@
</span><span class="cx"> , httpOnly(httpOnly)
</span><span class="cx"> , secure(secure)
</span><span class="cx"> , session(session)
</span><ins>+ , comment(comment)
+ , commentURL(commentURL)
+ , ports(ports)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -54,6 +57,7 @@
</span><span class="cx"> template<class Decoder> static bool decode(Decoder&, Cookie&);
</span><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span><ins>+ WEBCORE_EXPORT Cookie(NSHTTPCookie *);
</ins><span class="cx"> operator NSHTTPCookie *() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -66,6 +70,10 @@
</span><span class="cx"> bool httpOnly;
</span><span class="cx"> bool secure;
</span><span class="cx"> bool session;
</span><ins>+ String comment;
+ URL commentURL;
+ Vector<uint16_t> ports;
+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct CookieHash {
</span><span class="lines">@@ -83,14 +91,7 @@
</span><span class="cx"> template<class Encoder>
</span><span class="cx"> void Cookie::encode(Encoder& encoder) const
</span><span class="cx"> {
</span><del>- encoder << name;
- encoder << value;
- encoder << domain;
- encoder << path;
- encoder << expires;
- encoder << httpOnly;
- encoder << secure;
- encoder << session;
</del><ins>+ encoder << name << value << domain << path << expires << httpOnly << secure << session << comment << commentURL << ports;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<class Decoder>
</span><span class="lines">@@ -112,6 +113,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(cookie.session))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(cookie.comment))
+ return false;
+ if (!decoder.decode(cookie.commentURL))
+ return false;
+ if (!decoder.decode(cookie.ports))
+ return false;
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -124,5 +131,3 @@
</span><span class="cx"> typedef WebCore::CookieHash Hash;
</span><span class="cx"> };
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaCookieCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/CookieCocoa.mm (213777 => 213778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/CookieCocoa.mm 2017-03-13 01:37:36 UTC (rev 213777)
+++ trunk/Source/WebCore/platform/network/cocoa/CookieCocoa.mm 2017-03-13 01:54:16 UTC (rev 213778)
</span><span class="lines">@@ -26,28 +26,80 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "Cookie.h"
</span><span class="cx">
</span><del>-#import <wtf/BlockObjCExceptions.h>
</del><ins>+#import <wtf/text/StringBuilder.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static Vector<uint16_t> portVectorFromList(NSArray<NSNumber *> *portList)
+{
+ Vector<uint16_t> ports;
+ ports.reserveInitialCapacity(portList.count);
+
+ for (NSNumber *port : portList)
+ ports.uncheckedAppend(port.unsignedShortValue);
+
+ return ports;
+}
+
+static NSString *portStringFromVector(const Vector<uint16_t>& ports)
+{
+ if (ports.isEmpty())
+ return nil;
+
+ auto *string = [NSMutableString stringWithCapacity:ports.size() * 5];
+
+ for (size_t i = 0; i < ports.size() - 1; ++i)
+ [string appendFormat:@"%" PRIu16 ", ", ports[i]];
+
+ [string appendFormat:@"%" PRIu16, ports.last()];
+
+ return string;
+}
+
+Cookie::Cookie(NSHTTPCookie *cookie)
+ : Cookie(cookie.name, cookie.value, cookie.domain, cookie.path, [cookie.expiresDate timeIntervalSince1970] * 1000.0,
+ cookie.HTTPOnly, cookie.secure, cookie.sessionOnly, cookie.comment, cookie.commentURL, portVectorFromList(cookie.portList))
+{
+}
+
</ins><span class="cx"> Cookie::operator NSHTTPCookie *() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: existing APIs do not provide a way to set httpOnly without parsing headers from scratch.
</span><span class="cx">
</span><del>- BEGIN_BLOCK_OBJC_EXCEPTIONS
</del><ins>+ NSMutableDictionary *properties = [NSMutableDictionary dictionaryWithCapacity:11];
</ins><span class="cx">
</span><del>- return [NSHTTPCookie cookieWithProperties:@{
- NSHTTPCookieName: name,
- NSHTTPCookieValue: value,
- NSHTTPCookieDomain: domain,
- NSHTTPCookiePath: path,
- NSHTTPCookieDomain: domain,
- NSHTTPCookieSecure: @(secure),
- NSHTTPCookieDiscard: @(session),
- NSHTTPCookieExpires: [NSDate dateWithTimeIntervalSince1970:expires / 1000.0],
- }];
</del><ins>+ if (!comment.isNull())
+ [properties setObject:(NSString *)comment forKey:NSHTTPCookieComment];
</ins><span class="cx">
</span><del>- END_BLOCK_OBJC_EXCEPTIONS
</del><ins>+ if (!commentURL.isNull())
+ [properties setObject:(NSURL *)commentURL forKey:NSHTTPCookieCommentURL];
+
+ if (!domain.isNull())
+ [properties setObject:(NSString *)domain forKey:NSHTTPCookieDomain];
+
+ if (!name.isNull())
+ [properties setObject:(NSString *)name forKey:NSHTTPCookieName];
+
+ if (!path.isNull())
+ [properties setObject:(NSString *)path forKey:NSHTTPCookiePath];
+
+ if (!value.isNull())
+ [properties setObject:(NSString *)value forKey:NSHTTPCookieValue];
+
+ NSDate *expirationDate = [NSDate dateWithTimeIntervalSince1970:expires / 1000.0];
+ auto maxAge = [expirationDate timeIntervalSinceNow];
+ if (maxAge > 0)
+ [properties setObject:[NSString stringWithFormat:@"%f", maxAge] forKey:NSHTTPCookieMaximumAge];
+
+ auto* portString = portStringFromVector(ports);
+ if (portString)
+ [properties setObject:portString forKey:NSHTTPCookiePort];
+
+ [properties setObject:@(secure) forKey:NSHTTPCookieSecure];
+ [properties setObject:(session ? @"TRUE" : @"FALSE") forKey:NSHTTPCookieDiscard];
+ [properties setObject:@"1" forKey:NSHTTPCookieVersion];
+
+ return [NSHTTPCookie cookieWithProperties:properties];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacCookieJarMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm (213777 => 213778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2017-03-13 01:37:36 UTC (rev 213777)
+++ trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2017-03-13 01:54:16 UTC (rev 213778)
</span><span class="lines">@@ -228,9 +228,7 @@
</span><span class="cx"> rawCookies.reserveCapacity(count);
</span><span class="cx"> for (NSUInteger i = 0; i < count; ++i) {
</span><span class="cx"> NSHTTPCookie *cookie = (NSHTTPCookie *)[cookies objectAtIndex:i];
</span><del>- NSTimeInterval expires = [[cookie expiresDate] timeIntervalSince1970] * 1000;
- rawCookies.uncheckedAppend(Cookie([cookie name], [cookie value], [cookie domain], [cookie path], expires,
- [cookie isHTTPOnly], [cookie isSecure], [cookie isSessionOnly]));
</del><ins>+ rawCookies.uncheckedAppend({ cookie });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span></span></pre>
</div>
</div>
</body>
</html>