<!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>[200394] trunk/Source</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/200394">200394</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-03 16:26:03 -0700 (Tue, 03 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][DiskCache] Store common HTTP header names as strings
https://bugs.webkit.org/show_bug.cgi?id=157326
<rdar://problem/26073498>
Reviewed by Antti Koivisto.
Store common HTTP header names as strings in the disk cache instead of
using their value in the HTTPHeaderName enumeration. Having the disk
cache rely in the HTTPHeaderName enumeration is risky becomes it means
the cached data would become invalid every time someone updates
HTTPHeaderNames.in in WebCore. If someone were to update
HTTPHeaderNames.in without bumping the disk cache version, we would end
up with wrongly recognized HTTP header names after loading responses
from the cache.
* NetworkProcess/cache/NetworkCacheCoders.cpp:
(WebKit::NetworkCache::Coder<WebCore::HTTPHeaderMap>::encode):
(WebKit::NetworkCache::Coder<WebCore::HTTPHeaderMap>::decode):
* NetworkProcess/cache/NetworkCacheCoders.h:
* NetworkProcess/cache/NetworkCacheStorage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderMaph">trunk/Source/WebCore/platform/network/HTTPHeaderMap.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheCoderscpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheCodersh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.h (200393 => 200394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2016-05-03 23:25:30 UTC (rev 200393)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2016-05-03 23:26:03 UTC (rev 200394)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String get(const String& name) const;
</span><span class="cx"> WEBCORE_EXPORT void set(const String& name, const String& value);
</span><del>- void add(const String& name, const String& value);
</del><ins>+ WEBCORE_EXPORT void add(const String& name, const String& value);
</ins><span class="cx"> WEBCORE_EXPORT bool contains(const String&) const;
</span><span class="cx"> bool remove(const String&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200393 => 200394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-03 23:25:30 UTC (rev 200393)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-03 23:26:03 UTC (rev 200394)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-05-03 Chris Dumez <cdumez@apple.com>
+
+ [WK2][DiskCache] Store common HTTP header names as strings
+ https://bugs.webkit.org/show_bug.cgi?id=157326
+ <rdar://problem/26073498>
+
+ Reviewed by Antti Koivisto.
+
+ Store common HTTP header names as strings in the disk cache instead of
+ using their value in the HTTPHeaderName enumeration. Having the disk
+ cache rely in the HTTPHeaderName enumeration is risky becomes it means
+ the cached data would become invalid every time someone updates
+ HTTPHeaderNames.in in WebCore. If someone were to update
+ HTTPHeaderNames.in without bumping the disk cache version, we would end
+ up with wrongly recognized HTTP header names after loading responses
+ from the cache.
+
+ * NetworkProcess/cache/NetworkCacheCoders.cpp:
+ (WebKit::NetworkCache::Coder<WebCore::HTTPHeaderMap>::encode):
+ (WebKit::NetworkCache::Coder<WebCore::HTTPHeaderMap>::decode):
+ * NetworkProcess/cache/NetworkCacheCoders.h:
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+
</ins><span class="cx"> 2016-05-03 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Temporary workaround for Apple Internal builds
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp (200393 => 200394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp 2016-05-03 23:25:30 UTC (rev 200393)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp 2016-05-03 23:26:03 UTC (rev 200394)
</span><span class="lines">@@ -190,7 +190,35 @@
</span><span class="cx"> return decoder.decodeFixedLengthData(digest.data(), sizeof(digest));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Store common HTTP headers as strings instead of using their value in the HTTPHeaderName enumeration
+// so that the headers stored in the cache stays valid even after HTTPHeaderName.in gets updated.
+void Coder<WebCore::HTTPHeaderMap>::encode(Encoder& encoder, const WebCore::HTTPHeaderMap& headers)
+{
+ encoder << static_cast<uint64_t>(headers.size());
+ for (auto& keyValue : headers) {
+ encoder << keyValue.key;
+ encoder << keyValue.value;
+ }
</ins><span class="cx"> }
</span><ins>+
+bool Coder<WebCore::HTTPHeaderMap>::decode(Decoder& decoder, WebCore::HTTPHeaderMap& headers)
+{
+ uint64_t headersSize;
+ if (!decoder.decode(headersSize))
+ return false;
+ for (uint64_t i = 0; i < headersSize; ++i) {
+ String name;
+ if (!decoder.decode(name))
+ return false;
+ String value;
+ if (!decoder.decode(value))
+ return false;
+ headers.add(name, value);
+ }
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h (200393 => 200394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h 2016-05-03 23:25:30 UTC (rev 200393)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h 2016-05-03 23:26:03 UTC (rev 200394)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "NetworkCacheDecoder.h"
</span><span class="cx"> #include "NetworkCacheEncoder.h"
</span><span class="cx"> #include <WebCore/CertificateInfo.h>
</span><ins>+#include <WebCore/HTTPHeaderMap.h>
</ins><span class="cx"> #include <WebCore/URL.h>
</span><span class="cx"> #include <utility>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -264,6 +265,11 @@
</span><span class="cx"> static bool decode(Decoder&, SHA1::Digest&);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<> struct Coder<WebCore::HTTPHeaderMap> {
+ static void encode(Encoder&, const WebCore::HTTPHeaderMap&);
+ static bool decode(Decoder&, WebCore::HTTPHeaderMap&);
+};
+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (200393 => 200394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2016-05-03 23:25:30 UTC (rev 200393)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2016-05-03 23:26:03 UTC (rev 200394)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> size_t capacity() const { return m_capacity; }
</span><span class="cx"> size_t approximateSize() const;
</span><span class="cx">
</span><del>- static const unsigned version = 6;
</del><ins>+ static const unsigned version = 7;
</ins><span class="cx">
</span><span class="cx"> String basePath() const;
</span><span class="cx"> String versionPath() const;
</span></span></pre>
</div>
</div>
</body>
</html>