<!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>[187698] trunk/Source/WebKit2</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/187698">187698</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-07-31 17:43:36 -0700 (Fri, 31 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][NetworkCache] Drop HTTP method from NetworkCache::Key
https://bugs.webkit.org/show_bug.cgi?id=143348
Reviewed by Antti Koivisto.
Drop HTTP method from NetworkCache::Key as we only cache GET responses
for now. Even when we start caching HEAD responses, we likely will not
want the method to be part of the key because:
- A HEAD response can be used to update the headers of a previously cached response to GET
- A cached GET response may be used to satisfy subsequent HEAD requests
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::makeCacheKey):
* NetworkProcess/cache/NetworkCacheKey.cpp:
(WebKit::NetworkCache::Key::Key):
(WebKit::NetworkCache::Key::operator==):
(WebKit::NetworkCache::Key::decode):
(WebKit::NetworkCache::Key::operator=): Deleted.
(WebKit::NetworkCache::Key::computeHash): Deleted.
(WebKit::NetworkCache::Key::encode): Deleted.
* NetworkProcess/cache/NetworkCacheKey.h:
(WebKit::NetworkCache::Key::method): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeycpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeyh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187697 => 187698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-01 00:29:44 UTC (rev 187697)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-01 00:43:36 UTC (rev 187698)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-07-31 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ [WK2][NetworkCache] Drop HTTP method from NetworkCache::Key
+ https://bugs.webkit.org/show_bug.cgi?id=143348
+
+ Reviewed by Antti Koivisto.
+
+ Drop HTTP method from NetworkCache::Key as we only cache GET responses
+ for now. Even when we start caching HEAD responses, we likely will not
+ want the method to be part of the key because:
+ - A HEAD response can be used to update the headers of a previously cached response to GET
+ - A cached GET response may be used to satisfy subsequent HEAD requests
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::makeCacheKey):
+ * NetworkProcess/cache/NetworkCacheKey.cpp:
+ (WebKit::NetworkCache::Key::Key):
+ (WebKit::NetworkCache::Key::operator==):
+ (WebKit::NetworkCache::Key::decode):
+ (WebKit::NetworkCache::Key::operator=): Deleted.
+ (WebKit::NetworkCache::Key::computeHash): Deleted.
+ (WebKit::NetworkCache::Key::encode): Deleted.
+ * NetworkProcess/cache/NetworkCacheKey.h:
+ (WebKit::NetworkCache::Key::method): Deleted.
+
+2015-07-31 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Coalesce concurrent authentication challenges for the same ProtectionSpace
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147496
</span><span class="cx"> <rdar://problem/16839069>
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (187697 => 187698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-08-01 00:29:44 UTC (rev 187697)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-08-01 00:43:36 UTC (rev 187698)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> // FIXME: This implements minimal Range header disk cache support. We don't parse
</span><span class="cx"> // ranges so only the same exact range request will be served from the cache.
</span><span class="cx"> String range = request.httpHeaderField(WebCore::HTTPHeaderName::Range);
</span><del>- return { request.httpMethod(), partition, range, request.url().string() };
</del><ins>+ return { partition, range, request.url().string() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String headerValueForVary(const WebCore::ResourceRequest& request, const String& headerName)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp (187697 => 187698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp 2015-08-01 00:29:44 UTC (rev 187697)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp 2015-08-01 00:43:36 UTC (rev 187698)
</span><span class="lines">@@ -37,17 +37,15 @@
</span><span class="cx"> namespace NetworkCache {
</span><span class="cx">
</span><span class="cx"> Key::Key(const Key& o)
</span><del>- : m_method(o.m_method.isolatedCopy())
- , m_partition(o.m_partition.isolatedCopy())
</del><ins>+ : m_partition(o.m_partition.isolatedCopy())
</ins><span class="cx"> , m_identifier(o.m_identifier.isolatedCopy())
</span><span class="cx"> , m_range(o.m_range.isolatedCopy())
</span><span class="cx"> , m_hash(o.m_hash)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Key::Key(const String& method, const String& partition, const String& range, const String& identifier)
- : m_method(method.isolatedCopy())
- , m_partition(partition.isolatedCopy())
</del><ins>+Key::Key(const String& partition, const String& range, const String& identifier)
+ : m_partition(partition.isolatedCopy())
</ins><span class="cx"> , m_identifier(identifier.isolatedCopy())
</span><span class="cx"> , m_range(range.isolatedCopy())
</span><span class="cx"> , m_hash(computeHash())
</span><span class="lines">@@ -56,7 +54,6 @@
</span><span class="cx">
</span><span class="cx"> Key& Key::operator=(const Key& other)
</span><span class="cx"> {
</span><del>- m_method = other.m_method.isolatedCopy();
</del><span class="cx"> m_partition = other.m_partition.isolatedCopy();
</span><span class="cx"> m_identifier = other.m_identifier.isolatedCopy();
</span><span class="cx"> m_range = other.m_range.isolatedCopy();
</span><span class="lines">@@ -85,7 +82,6 @@
</span><span class="cx"> // We don't really need a cryptographic hash. The key is always verified against the entry header.
</span><span class="cx"> // SHA1 just happens to be suitably sized, fast and available.
</span><span class="cx"> SHA1 sha1;
</span><del>- hashString(sha1, m_method);
</del><span class="cx"> hashString(sha1, m_partition);
</span><span class="cx"> hashString(sha1, m_identifier);
</span><span class="cx"> hashString(sha1, m_range);
</span><span class="lines">@@ -128,12 +124,11 @@
</span><span class="cx">
</span><span class="cx"> bool Key::operator==(const Key& other) const
</span><span class="cx"> {
</span><del>- return m_hash == other.m_hash && m_method == other.m_method && m_partition == other.m_partition && m_identifier == other.m_identifier && m_range == other.m_range;
</del><ins>+ return m_hash == other.m_hash && m_partition == other.m_partition && m_identifier == other.m_identifier && m_range == other.m_range;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Key::encode(Encoder& encoder) const
</span><span class="cx"> {
</span><del>- encoder << m_method;
</del><span class="cx"> encoder << m_partition;
</span><span class="cx"> encoder << m_identifier;
</span><span class="cx"> encoder << m_range;
</span><span class="lines">@@ -142,7 +137,7 @@
</span><span class="cx">
</span><span class="cx"> bool Key::decode(Decoder& decoder, Key& key)
</span><span class="cx"> {
</span><del>- return decoder.decode(key.m_method) && decoder.decode(key.m_partition) && decoder.decode(key.m_identifier) && decoder.decode(key.m_range) && decoder.decode(key.m_hash);
</del><ins>+ return decoder.decode(key.m_partition) && decoder.decode(key.m_identifier) && decoder.decode(key.m_range) && decoder.decode(key.m_hash);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h (187697 => 187698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h 2015-08-01 00:29:44 UTC (rev 187697)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h 2015-08-01 00:43:36 UTC (rev 187698)
</span><span class="lines">@@ -44,14 +44,13 @@
</span><span class="cx"> Key() { }
</span><span class="cx"> Key(const Key&);
</span><span class="cx"> Key(Key&&) = default;
</span><del>- Key(const String& method, const String& partition, const String& range, const String& identifier);
</del><ins>+ Key(const String& partition, const String& range, const String& identifier);
</ins><span class="cx">
</span><span class="cx"> Key& operator=(const Key&);
</span><span class="cx"> Key& operator=(Key&&) = default;
</span><span class="cx">
</span><span class="cx"> bool isNull() const { return m_identifier.isNull(); }
</span><span class="cx">
</span><del>- const String& method() const { return m_method; }
</del><span class="cx"> const String& partition() const { return m_partition; }
</span><span class="cx"> const String& identifier() const { return m_identifier; }
</span><span class="cx">
</span><span class="lines">@@ -71,7 +70,6 @@
</span><span class="cx"> private:
</span><span class="cx"> HashType computeHash() const;
</span><span class="cx">
</span><del>- String m_method;
</del><span class="cx"> String m_partition;
</span><span class="cx"> String m_identifier;
</span><span class="cx"> String m_range;
</span></span></pre>
</div>
</div>
</body>
</html>