<!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>[201805] trunk</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/201805">201805</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-06-08 06:37:04 -0700 (Wed, 08 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit memory cache doesn't respect Vary header
https://bugs.webkit.org/show_bug.cgi?id=71509
<rdar://problem/26651033>
Reviewed by Sam Weinig.
Source/WebCore:
Implement Vary header support in WebCore memory cache.
The patch moves Vary header code from WebKit2 Network Cache to WebCore and uses it to
verify the headers for CachedResources.
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::failBeforeStarting):
(WebCore::addAdditionalRequestHeadersToRequest):
Factor into standalone function so we can use it from varyHeaderValuesMatch.
(WebCore::CachedResource::addAdditionalRequestHeaders):
(WebCore::CachedResource::load):
(WebCore::CachedResource::setResponse):
Collect the Vary header values when we receive a response.
(WebCore::CachedResource::responseReceived):
(WebCore::CachedResource::redirectChainAllowsReuse):
(WebCore::CachedResource::varyHeaderValuesMatch):
Test for Vary match.
(WebCore::CachedResource::overheadSize):
* loader/cache/CachedResource.h:
(WebCore::CachedResource::isCacheValidator):
(WebCore::CachedResource::resourceToRevalidate):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::determineRevalidationPolicy):
Reload on Vary mismatch.
* platform/network/CacheValidation.cpp:
(WebCore::parseCacheControlDirectives):
(WebCore::headerValueForVary):
(WebCore::collectVaryingRequestHeaders):
(WebCore::verifyVaryingRequestHeaders):
Vary header collection and validation code moves here.
* platform/network/CacheValidation.h:
Source/WebKit2:
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::makeCacheKey):
(WebKit::NetworkCache::cachePolicyAllowsExpired):
(WebKit::NetworkCache::makeUseDecision):
(WebKit::NetworkCache::Cache::retrieve):
(WebKit::NetworkCache::Cache::store):
(WebKit::NetworkCache::Cache::storeRedirect):
(WebKit::NetworkCache::Cache::update):
(WebKit::NetworkCache::headerValueForVary): Deleted.
(WebKit::NetworkCache::collectVaryingRequestHeaders): Deleted.
(WebKit::NetworkCache::verifyVaryingRequestHeaders): Deleted.
These move to WebCore.
LayoutTests:
* http/tests/cache/disk-cache/disk-cache-vary-expected.txt:
* http/tests/cache/disk-cache/disk-cache-vary-no-body-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestscachediskcachediskcachevaryexpectedtxt">trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscachediskcachediskcachevarynobodyexpectedtxt">trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-no-body-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceh">trunk/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCacheValidationcpp">trunk/Source/WebCore/platform/network/CacheValidation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCacheValidationh">trunk/Source/WebCore/platform/network/CacheValidation.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201804 => 201805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-08 12:56:36 UTC (rev 201804)
+++ trunk/LayoutTests/ChangeLog 2016-06-08 13:37:04 UTC (rev 201805)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-06 Antti Koivisto <antti@apple.com>
+
+ WebKit memory cache doesn't respect Vary header
+ https://bugs.webkit.org/show_bug.cgi?id=71509
+ <rdar://problem/26651033>
+
+ Reviewed by Sam Weinig.
+
+ * http/tests/cache/disk-cache/disk-cache-vary-expected.txt:
+ * http/tests/cache/disk-cache/disk-cache-vary-no-body-expected.txt:
+
</ins><span class="cx"> 2016-06-08 Adam Bergkvist <adam.bergkvist@ericsson.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: Imlement MediaEndpointPeerConnection::setLocalDescription()
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcachediskcachevaryexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-expected.txt (201804 => 201805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-expected.txt 2016-06-08 12:56:36 UTC (rev 201804)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-expected.txt 2016-06-08 13:37:04 UTC (rev 201805)
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"max-age=100","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"no-store","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><span class="lines">@@ -586,15 +586,15 @@
</span><span class="cx">
</span><span class="cx"> response headers: {"ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache after validation
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"max-age=0","ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache after validation
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"max-age=100","ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"no-store","ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><span class="lines">@@ -610,15 +610,15 @@
</span><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"no-cache","ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache after validation
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache after validation
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache after validation
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"ETag":"nomatch","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"max-age=100","ETag":"nomatch","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"no-store","ETag":"nomatch","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcachediskcachevarynobodyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-no-body-expected.txt (201804 => 201805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-no-body-expected.txt 2016-06-08 12:56:36 UTC (rev 201804)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-no-body-expected.txt 2016-06-08 13:37:04 UTC (rev 201805)
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"max-age=100","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"no-store","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><span class="lines">@@ -586,15 +586,15 @@
</span><span class="cx">
</span><span class="cx"> response headers: {"ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache after validation
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"max-age=0","ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache after validation
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"max-age=100","ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"no-store","ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><span class="lines">@@ -610,15 +610,15 @@
</span><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"no-cache","ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache after validation
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache after validation
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache after validation
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"ETag":"nomatch","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"max-age=100","ETag":"nomatch","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span><del>-response source: Memory cache
</del><ins>+response source: Network
</ins><span class="cx">
</span><span class="cx"> response headers: {"Cache-control":"no-store","ETag":"nomatch","Vary":"Accept-Language"}
</span><span class="cx"> request headers: {"Accept-Language":"unique()"}
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201804 => 201805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-08 12:56:36 UTC (rev 201804)
+++ trunk/Source/WebCore/ChangeLog 2016-06-08 13:37:04 UTC (rev 201805)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2016-06-08 Antti Koivisto <antti@apple.com>
+
+ WebKit memory cache doesn't respect Vary header
+ https://bugs.webkit.org/show_bug.cgi?id=71509
+ <rdar://problem/26651033>
+
+ Reviewed by Sam Weinig.
+
+ Implement Vary header support in WebCore memory cache.
+
+ The patch moves Vary header code from WebKit2 Network Cache to WebCore and uses it to
+ verify the headers for CachedResources.
+
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::failBeforeStarting):
+ (WebCore::addAdditionalRequestHeadersToRequest):
+
+ Factor into standalone function so we can use it from varyHeaderValuesMatch.
+
+ (WebCore::CachedResource::addAdditionalRequestHeaders):
+ (WebCore::CachedResource::load):
+ (WebCore::CachedResource::setResponse):
+
+ Collect the Vary header values when we receive a response.
+
+ (WebCore::CachedResource::responseReceived):
+ (WebCore::CachedResource::redirectChainAllowsReuse):
+ (WebCore::CachedResource::varyHeaderValuesMatch):
+
+ Test for Vary match.
+
+ (WebCore::CachedResource::overheadSize):
+ * loader/cache/CachedResource.h:
+ (WebCore::CachedResource::isCacheValidator):
+ (WebCore::CachedResource::resourceToRevalidate):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::determineRevalidationPolicy):
+
+ Reload on Vary mismatch.
+
+ * platform/network/CacheValidation.cpp:
+ (WebCore::parseCacheControlDirectives):
+ (WebCore::headerValueForVary):
+ (WebCore::collectVaryingRequestHeaders):
+ (WebCore::verifyVaryingRequestHeaders):
+
+ Vary header collection and validation code moves here.
+
+ * platform/network/CacheValidation.h:
+
</ins><span class="cx"> 2016-06-08 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201800.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (201804 => 201805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-06-08 12:56:36 UTC (rev 201804)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-06-08 13:37:04 UTC (rev 201805)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> error(CachedResource::LoadError);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedResource::addAdditionalRequestHeaders(CachedResourceLoader& cachedResourceLoader)
</del><ins>+static void addAdditionalRequestHeadersToRequest(ResourceRequest& request, const CachedResourceLoader& cachedResourceLoader)
</ins><span class="cx"> {
</span><span class="cx"> // Note: We skip the Content-Security-Policy check here because we check
</span><span class="cx"> // the Content-Security-Policy at the CachedResourceLoader layer so we can
</span><span class="lines">@@ -191,24 +191,30 @@
</span><span class="cx"> FrameLoader& frameLoader = cachedResourceLoader.frame()->loader();
</span><span class="cx"> String outgoingReferrer;
</span><span class="cx"> String outgoingOrigin;
</span><del>- if (m_resourceRequest.httpReferrer().isNull()) {
</del><ins>+ if (request.httpReferrer().isNull()) {
</ins><span class="cx"> outgoingReferrer = frameLoader.outgoingReferrer();
</span><span class="cx"> outgoingOrigin = frameLoader.outgoingOrigin();
</span><span class="cx"> } else {
</span><del>- outgoingReferrer = m_resourceRequest.httpReferrer();
</del><ins>+ outgoingReferrer = request.httpReferrer();
</ins><span class="cx"> outgoingOrigin = SecurityOrigin::createFromString(outgoingReferrer)->toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- outgoingReferrer = SecurityPolicy::generateReferrerHeader(cachedResourceLoader.document()->referrerPolicy(), m_resourceRequest.url(), outgoingReferrer);
</del><ins>+ auto referrerPolicy = cachedResourceLoader.document() ? cachedResourceLoader.document()->referrerPolicy() : ReferrerPolicy::Default;
+ outgoingReferrer = SecurityPolicy::generateReferrerHeader(referrerPolicy, request.url(), outgoingReferrer);
</ins><span class="cx"> if (outgoingReferrer.isEmpty())
</span><del>- m_resourceRequest.clearHTTPReferrer();
</del><ins>+ request.clearHTTPReferrer();
</ins><span class="cx"> else
</span><del>- m_resourceRequest.setHTTPReferrer(outgoingReferrer);
- FrameLoader::addHTTPOriginIfNeeded(m_resourceRequest, outgoingOrigin);
</del><ins>+ request.setHTTPReferrer(outgoingReferrer);
+ FrameLoader::addHTTPOriginIfNeeded(request, outgoingOrigin);
</ins><span class="cx">
</span><del>- frameLoader.addExtraFieldsToSubresourceRequest(m_resourceRequest);
</del><ins>+ frameLoader.addExtraFieldsToSubresourceRequest(request);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void CachedResource::addAdditionalRequestHeaders(CachedResourceLoader& cachedResourceLoader)
+{
+ addAdditionalRequestHeadersToRequest(m_resourceRequest, cachedResourceLoader);
+}
+
</ins><span class="cx"> void CachedResource::load(CachedResourceLoader& cachedResourceLoader, const ResourceLoaderOptions& options)
</span><span class="cx"> {
</span><span class="cx"> if (!cachedResourceLoader.frame()) {
</span><span class="lines">@@ -417,6 +423,8 @@
</span><span class="cx"> m_response = response;
</span><span class="cx"> m_response.setType(m_responseType);
</span><span class="cx"> m_response.setRedirected(m_redirectChainCacheStatus.status != RedirectChainCacheStatus::NoRedirection);
</span><ins>+
+ m_varyingHeaderValues = collectVaryingRequestHeaders(m_resourceRequest, m_response, m_sessionID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedResource::responseReceived(const ResourceResponse& response)
</span><span class="lines">@@ -765,6 +773,17 @@
</span><span class="cx"> return WebCore::redirectChainAllowsReuse(m_redirectChainCacheStatus, reuseExpiredRedirection);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool CachedResource::varyHeaderValuesMatch(const ResourceRequest& request, const CachedResourceLoader& cachedResourceLoader)
+{
+ if (m_varyingHeaderValues.isEmpty())
+ return true;
+
+ ResourceRequest requestWithFullHeaders(request);
+ addAdditionalRequestHeadersToRequest(requestWithFullHeaders, cachedResourceLoader);
+
+ return verifyVaryingRequestHeaders(m_varyingHeaderValues, requestWithFullHeaders, m_sessionID);
+}
+
</ins><span class="cx"> unsigned CachedResource::overheadSize() const
</span><span class="cx"> {
</span><span class="cx"> static const int kAverageClientsHashMapSize = 384;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (201804 => 201805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2016-06-08 12:56:36 UTC (rev 201804)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2016-06-08 13:37:04 UTC (rev 201805)
</span><span class="lines">@@ -242,6 +242,8 @@
</span><span class="cx"> virtual RevalidationDecision makeRevalidationDecision(CachePolicy) const;
</span><span class="cx"> bool redirectChainAllowsReuse(ReuseExpiredRedirectionOrNot) const;
</span><span class="cx">
</span><ins>+ bool varyHeaderValuesMatch(const ResourceRequest&, const CachedResourceLoader&);
+
</ins><span class="cx"> bool isCacheValidator() const { return m_resourceToRevalidate; }
</span><span class="cx"> CachedResource* resourceToRevalidate() const { return m_resourceToRevalidate; }
</span><span class="cx">
</span><span class="lines">@@ -354,6 +356,8 @@
</span><span class="cx">
</span><span class="cx"> RedirectChainCacheStatus m_redirectChainCacheStatus;
</span><span class="cx">
</span><ins>+ Vector<std::pair<String, String>> m_varyingHeaderValues;
+
</ins><span class="cx"> unsigned long m_identifierForLoadWithoutResourceLoader { 0 };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (201804 => 201805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-06-08 12:56:36 UTC (rev 201804)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-06-08 13:37:04 UTC (rev 201805)
</span><span class="lines">@@ -753,6 +753,9 @@
</span><span class="cx"> return Reload;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!existingResource->varyHeaderValuesMatch(request, *this))
+ return Reload;
+
</ins><span class="cx"> auto* textDecoder = existingResource->textResourceDecoder();
</span><span class="cx"> if (textDecoder && !textDecoder->hasEqualEncodingForCharset(cachedResourceRequest.charset()))
</span><span class="cx"> return Reload;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCacheValidationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CacheValidation.cpp (201804 => 201805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CacheValidation.cpp 2016-06-08 12:56:36 UTC (rev 201804)
+++ trunk/Source/WebCore/platform/network/CacheValidation.cpp 2016-06-08 13:37:04 UTC (rev 201805)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,7 +26,12 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CacheValidation.h"
</span><span class="cx">
</span><ins>+#include "CookiesStrategy.h"
</ins><span class="cx"> #include "HTTPHeaderMap.h"
</span><ins>+#include "NetworkStorageSession.h"
+#include "PlatformCookieJar.h"
+#include "PlatformStrategies.h"
+#include "ResourceRequest.h"
</ins><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="lines">@@ -326,4 +331,58 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static String headerValueForVary(const ResourceRequest& request, const String& headerName, SessionID sessionID)
+{
+ // Explicit handling for cookies is needed because they are added magically by the networking layer.
+ // FIXME: The value might have changed between making the request and retrieving the cookie here.
+ // We could fetch the cookie when making the request but that seems overkill as the case is very rare and it
+ // is a blocking operation. This should be sufficient to cover reasonable cases.
+ if (headerName == httpHeaderNameString(HTTPHeaderName::Cookie)) {
+ if (sessionID != SessionID::defaultSessionID()) {
+ // FIXME: Don't know how to get the cookie. There should be a global way to get NetworkStorageSession from sessionID.
+ return "";
+ }
+ auto& session = NetworkStorageSession::defaultStorageSession();
+ auto* cookieStrategy = platformStrategies() ? platformStrategies()->cookiesStrategy() : nullptr;
+ if (!cookieStrategy)
+ return cookieRequestHeaderFieldValue(session, request.firstPartyForCookies(), request.url());
+ return cookieStrategy->cookieRequestHeaderFieldValue(session, request.firstPartyForCookies(), request.url());
+ }
+ return request.httpHeaderField(headerName);
</ins><span class="cx"> }
</span><ins>+
+Vector<std::pair<String, String>> collectVaryingRequestHeaders(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response, SessionID sessionID)
+{
+ String varyValue = response.httpHeaderField(WebCore::HTTPHeaderName::Vary);
+ if (varyValue.isEmpty())
+ return { };
+ Vector<String> varyingHeaderNames;
+ varyValue.split(',', /*allowEmptyEntries*/ false, varyingHeaderNames);
+ Vector<std::pair<String, String>> varyingRequestHeaders;
+ varyingRequestHeaders.reserveCapacity(varyingHeaderNames.size());
+ for (auto& varyHeaderName : varyingHeaderNames) {
+ String headerName = varyHeaderName.stripWhiteSpace();
+ String headerValue = headerValueForVary(request, headerName, sessionID);
+ varyingRequestHeaders.append(std::make_pair(headerName, headerValue));
+ }
+ return varyingRequestHeaders;
+}
+
+bool verifyVaryingRequestHeaders(const Vector<std::pair<String, String>>& varyingRequestHeaders, const WebCore::ResourceRequest& request, SessionID sessionID)
+{
+ for (auto& varyingRequestHeader : varyingRequestHeaders) {
+ // FIXME: Vary: * in response would ideally trigger a cache delete instead of a store.
+ if (varyingRequestHeader.first == "*")
+ return false;
+ if (sessionID != SessionID::defaultSessionID() && varyingRequestHeader.first == httpHeaderNameString(HTTPHeaderName::Cookie)) {
+ // FIXME: See the comment in headerValueForVary.
+ return false;
+ }
+ String headerValue = headerValueForVary(request, varyingRequestHeader.first, sessionID);
+ if (headerValue != varyingRequestHeader.second)
+ return false;
+ }
+ return true;
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCacheValidationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CacheValidation.h (201804 => 201805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CacheValidation.h 2016-06-08 12:56:36 UTC (rev 201804)
+++ trunk/Source/WebCore/platform/network/CacheValidation.h 2016-06-08 13:37:04 UTC (rev 201805)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,11 +27,15 @@
</span><span class="cx"> #define CacheValidation_h
</span><span class="cx">
</span><span class="cx"> #include "PlatformExportMacros.h"
</span><ins>+#include "SessionID.h"
</ins><span class="cx"> #include <wtf/Optional.h>
</span><ins>+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class HTTPHeaderMap;
</span><ins>+class ResourceRequest;
</ins><span class="cx"> class ResourceResponse;
</span><span class="cx">
</span><span class="cx"> struct RedirectChainCacheStatus {
</span><span class="lines">@@ -65,6 +69,9 @@
</span><span class="cx"> };
</span><span class="cx"> WEBCORE_EXPORT CacheControlDirectives parseCacheControlDirectives(const HTTPHeaderMap&);
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT Vector<std::pair<String, String>> collectVaryingRequestHeaders(const ResourceRequest&, const ResourceResponse&, SessionID = SessionID::defaultSessionID());
+WEBCORE_EXPORT bool verifyVaryingRequestHeaders(const Vector<std::pair<String, String>>& varyingRequestHeaders, const ResourceRequest&, SessionID = SessionID::defaultSessionID());
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201804 => 201805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-08 12:56:36 UTC (rev 201804)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-08 13:37:04 UTC (rev 201805)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-06-06 Antti Koivisto <antti@apple.com>
+
+ WebKit memory cache doesn't respect Vary header
+ https://bugs.webkit.org/show_bug.cgi?id=71509
+ <rdar://problem/26651033>
+
+ Reviewed by Sam Weinig.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::makeCacheKey):
+ (WebKit::NetworkCache::cachePolicyAllowsExpired):
+ (WebKit::NetworkCache::makeUseDecision):
+ (WebKit::NetworkCache::Cache::retrieve):
+ (WebKit::NetworkCache::Cache::store):
+ (WebKit::NetworkCache::Cache::storeRedirect):
+ (WebKit::NetworkCache::Cache::update):
+ (WebKit::NetworkCache::headerValueForVary): Deleted.
+ (WebKit::NetworkCache::collectVaryingRequestHeaders): Deleted.
+ (WebKit::NetworkCache::verifyVaryingRequestHeaders): Deleted.
+
+ These move to WebCore.
+
</ins><span class="cx"> 2016-06-08 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix GTK+ build with threaded compositor enabled after r201802.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (201804 => 201805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-06-08 12:56:36 UTC (rev 201804)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-06-08 13:37:04 UTC (rev 201805)
</span><span class="lines">@@ -128,47 +128,6 @@
</span><span class="cx"> return { partition, resourceType(), range, request.url().string() };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String headerValueForVary(const WebCore::ResourceRequest& request, const String& headerName)
-{
- // Explicit handling for cookies is needed because they are added magically by the networking layer.
- // FIXME: The value might have changed between making the request and retrieving the cookie here.
- // We could fetch the cookie when making the request but that seems overkill as the case is very rare and it
- // is a blocking operation. This should be sufficient to cover reasonable cases.
- if (headerName == httpHeaderNameString(WebCore::HTTPHeaderName::Cookie))
- return WebCore::cookieRequestHeaderFieldValue(WebCore::NetworkStorageSession::defaultStorageSession(), request.firstPartyForCookies(), request.url());
- return request.httpHeaderField(headerName);
-}
-
-static Vector<std::pair<String, String>> collectVaryingRequestHeaders(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
-{
- String varyValue = response.httpHeaderField(WebCore::HTTPHeaderName::Vary);
- if (varyValue.isEmpty())
- return { };
- Vector<String> varyingHeaderNames;
- varyValue.split(',', /*allowEmptyEntries*/ false, varyingHeaderNames);
- Vector<std::pair<String, String>> varyingRequestHeaders;
- varyingRequestHeaders.reserveCapacity(varyingHeaderNames.size());
- for (auto& varyHeaderName : varyingHeaderNames) {
- String headerName = varyHeaderName.stripWhiteSpace();
- String headerValue = headerValueForVary(request, headerName);
- varyingRequestHeaders.append(std::make_pair(headerName, headerValue));
- }
- return varyingRequestHeaders;
-}
-
-static bool verifyVaryingRequestHeaders(const Vector<std::pair<String, String>>& varyingRequestHeaders, const WebCore::ResourceRequest& request)
-{
- for (auto& varyingRequestHeader : varyingRequestHeaders) {
- // FIXME: Vary: * in response would ideally trigger a cache delete instead of a store.
- if (varyingRequestHeader.first == "*")
- return false;
- String headerValue = headerValueForVary(request, varyingRequestHeader.first);
- if (headerValue != varyingRequestHeader.second)
- return false;
- }
- return true;
-}
-
</del><span class="cx"> static bool cachePolicyAllowsExpired(WebCore::ResourceRequestCachePolicy policy)
</span><span class="cx"> {
</span><span class="cx"> switch (policy) {
</span><span class="lines">@@ -221,7 +180,7 @@
</span><span class="cx"> if (request.isConditional() && !entry.redirectRequest())
</span><span class="cx"> return UseDecision::Validate;
</span><span class="cx">
</span><del>- if (!verifyVaryingRequestHeaders(entry.varyingRequestHeaders(), request))
</del><ins>+ if (!WebCore::verifyVaryingRequestHeaders(entry.varyingRequestHeaders(), request))
</ins><span class="cx"> return UseDecision::NoDueToVaryingHeaderMismatch;
</span><span class="cx">
</span><span class="cx"> // We never revalidate in the case of a history navigation.
</span><span class="lines">@@ -374,7 +333,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
</span><span class="cx"> if (canUseSpeculativeRevalidation && m_speculativeLoadManager->retrieve(frameID, storageKey, request, [request, completionHandler](std::unique_ptr<Entry> entry) {
</span><del>- if (entry && verifyVaryingRequestHeaders(entry->varyingRequestHeaders(), request))
</del><ins>+ if (entry && WebCore::verifyVaryingRequestHeaders(entry->varyingRequestHeaders(), request))
</ins><span class="cx"> completionHandler(WTFMove(entry));
</span><span class="cx"> else
</span><span class="cx"> completionHandler(nullptr);
</span><span class="lines">@@ -447,7 +406,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto cacheEntry = std::make_unique<Entry>(makeCacheKey(request), response, WTFMove(responseData), collectVaryingRequestHeaders(request, response));
</del><ins>+ auto cacheEntry = std::make_unique<Entry>(makeCacheKey(request), response, WTFMove(responseData), WebCore::collectVaryingRequestHeaders(request, response));
</ins><span class="cx"> auto record = cacheEntry->encodeAsStorageRecord();
</span><span class="cx">
</span><span class="cx"> m_storage->store(record, [completionHandler = WTFMove(completionHandler)](const Data& bodyData) {
</span><span class="lines">@@ -482,7 +441,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- std::unique_ptr<Entry> cacheEntry = std::make_unique<Entry>(makeCacheKey(request), response, redirectRequest, collectVaryingRequestHeaders(request, response));
</del><ins>+ std::unique_ptr<Entry> cacheEntry = std::make_unique<Entry>(makeCacheKey(request), response, redirectRequest, WebCore::collectVaryingRequestHeaders(request, response));
</ins><span class="cx">
</span><span class="cx"> auto record = cacheEntry->encodeAsStorageRecord();
</span><span class="cx">
</span><span class="lines">@@ -498,7 +457,7 @@
</span><span class="cx"> WebCore::ResourceResponse response = existingEntry.response();
</span><span class="cx"> WebCore::updateResponseHeadersAfterRevalidation(response, validatingResponse);
</span><span class="cx">
</span><del>- auto updateEntry = std::make_unique<Entry>(existingEntry.key(), response, existingEntry.buffer(), collectVaryingRequestHeaders(originalRequest, response));
</del><ins>+ auto updateEntry = std::make_unique<Entry>(existingEntry.key(), response, existingEntry.buffer(), WebCore::collectVaryingRequestHeaders(originalRequest, response));
</ins><span class="cx"> auto updateRecord = updateEntry->encodeAsStorageRecord();
</span><span class="cx">
</span><span class="cx"> m_storage->store(updateRecord, { });
</span></span></pre>
</div>
</div>
</body>
</html>