<!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>[181651] 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/181651">181651</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-03-17 09:09:06 -0700 (Tue, 17 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disk cache should support Vary: Cookie
https://bugs.webkit.org/show_bug.cgi?id=142770
Source/WebKit2:
rdar://problem/19764945
Reviewed by Anders Carlsson.
Cookies are not part of the original request but are added by the networking layer when submitting the request.
Fetch them explicitly when resolving Vary: Cookie.
The implementation is not perfect as it fetches the cookie for the cache entry when saving a Vary:Cookie response,
not when making the request. In principle the cookie may have changed in-between. This should be enough to handle
reasonable cases though. Fetching cookies for every request might be too expensive for this rarely used feature.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::headerValueForVary):
(WebKit::NetworkCache::encodeStorageEntry):
(WebKit::NetworkCache::verifyVaryingRequestHeaders):
LayoutTests:
Reviewed by Anders Carlsson.
* http/tests/cache/disk-cache-vary-cookie-expected.txt: Added.
* http/tests/cache/disk-cache-vary-cookie.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscachediskcachevarycookieexpectedtxt">trunk/LayoutTests/http/tests/cache/disk-cache-vary-cookie-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscachediskcachevarycookiehtml">trunk/LayoutTests/http/tests/cache/disk-cache-vary-cookie.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (181650 => 181651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-03-17 15:50:44 UTC (rev 181650)
+++ trunk/LayoutTests/ChangeLog        2015-03-17 16:09:06 UTC (rev 181651)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-17 Antti Koivisto <antti@apple.com>
+
+ Disk cache should support Vary: Cookie
+ https://bugs.webkit.org/show_bug.cgi?id=142770
+
+ Reviewed by Anders Carlsson.
+
+ * http/tests/cache/disk-cache-vary-cookie-expected.txt: Added.
+ * http/tests/cache/disk-cache-vary-cookie.html: Added.
+
</ins><span class="cx"> 2015-03-16 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Enable ES6 classes by default
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcachevarycookieexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/disk-cache-vary-cookie-expected.txt (0 => 181651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache-vary-cookie-expected.txt         (rev 0)
+++ trunk/LayoutTests/http/tests/cache/disk-cache-vary-cookie-expected.txt        2015-03-17 16:09:06 UTC (rev 181651)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+Test that Vary: Cookie in response is handled by the disk cache.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Setting cookie and loading
+response headers: {"Cache-control":"max-age=100"}
+response source: Network
+
+response headers: {"Vary":"Cookie","Cache-control":"max-age=100"}
+response source: Network
+
+Loading again
+response headers: {"Cache-control":"max-age=100"}
+response source: Disk cache
+
+response headers: {"Vary":"Cookie","Cache-control":"max-age=100"}
+response source: Disk cache
+
+Changing cookie and loading
+response headers: {"Cache-control":"max-age=100"}
+response source: Disk cache
+
+response headers: {"Vary":"Cookie","Cache-control":"max-age=100"}
+response source: Network
+
+Loading again
+response headers: {"Cache-control":"max-age=100"}
+response source: Disk cache
+
+response headers: {"Vary":"Cookie","Cache-control":"max-age=100"}
+response source: Disk cache
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcachevarycookiehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/disk-cache-vary-cookie.html (0 => 181651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache-vary-cookie.html         (rev 0)
+++ trunk/LayoutTests/http/tests/cache/disk-cache-vary-cookie.html        2015-03-17 16:09:06 UTC (rev 181651)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<script src="/js-test-resources/js-test-pre.js"></script>
+<script src="resources/cache-test.js"></script>
+<body>
+<script>
+
+var tests =
+[
+ { responseHeaders: {'Cache-control': 'max-age=100'} },
+ { responseHeaders: {'Vary': 'Cookie', 'Cache-control': 'max-age=100'} },
+];
+
+description("Test that Vary: Cookie in response is handled by the disk cache.");
+
+debug("Setting cookie and loading");
+document.cookie = "cookie=value";
+loadResources(tests, function () {
+ printResults(tests);
+ internals.clearMemoryCache();
+ debug("Loading again");
+ loadResources(tests, function () {
+ printResults(tests);
+ internals.clearMemoryCache();
+ debug("Changing cookie and loading");
+ document.cookie = "cookie=othervalue";
+ loadResources(tests, function () {
+ printResults(tests);
+ internals.clearMemoryCache()
+ debug("Loading again");
+ loadResources(tests, function () {
+ printResults(tests);
+ finishJSTest();
+ });
+ });
+ });
+});
+
+</script>
+<script src="/js-test-resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (181650 => 181651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2015-03-17 15:50:44 UTC (rev 181650)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2015-03-17 16:09:06 UTC (rev 181651)
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx"> # Disk cache is WK2 only
</span><span class="cx"> http/tests/cache/disk-cache-validation.html
</span><span class="cx"> http/tests/cache/disk-cache-disable.html
</span><ins>+http/tests/cache/disk-cache-vary-cookie.html
</ins><span class="cx">
</span><span class="cx"> ### END OF (2) Failures without bug reports
</span><span class="cx"> ########################################
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (181650 => 181651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations        2015-03-17 15:50:44 UTC (rev 181650)
+++ trunk/LayoutTests/platform/win/TestExpectations        2015-03-17 16:09:06 UTC (rev 181651)
</span><span class="lines">@@ -2222,6 +2222,7 @@
</span><span class="cx"> # Disk cache is WK2 only
</span><span class="cx"> http/tests/cache/disk-cache-validation.html
</span><span class="cx"> http/tests/cache/disk-cache-disable.html
</span><ins>+http/tests/cache/disk-cache-vary-cookie.html
</ins><span class="cx">
</span><span class="cx"> # The following are unreviewed:
</span><span class="cx"> http/tests/cache/content-type-ignored-during-revalidation.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181650 => 181651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-03-17 15:50:44 UTC (rev 181650)
+++ trunk/Source/WebKit2/ChangeLog        2015-03-17 16:09:06 UTC (rev 181651)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-03-17 Antti Koivisto <antti@apple.com>
+
+ Disk cache should support Vary: Cookie
+ https://bugs.webkit.org/show_bug.cgi?id=142770
+ rdar://problem/19764945
+
+ Reviewed by Anders Carlsson.
+
+ Cookies are not part of the original request but are added by the networking layer when submitting the request.
+ Fetch them explicitly when resolving Vary: Cookie.
+
+ The implementation is not perfect as it fetches the cookie for the cache entry when saving a Vary:Cookie response,
+ not when making the request. In principle the cookie may have changed in-between. This should be enough to handle
+ reasonable cases though. Fetching cookies for every request might be too expensive for this rarely used feature.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::headerValueForVary):
+ (WebKit::NetworkCache::encodeStorageEntry):
+ (WebKit::NetworkCache::verifyVaryingRequestHeaders):
+
</ins><span class="cx"> 2015-03-17 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Use C++ lambdas in IPC::Connection
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (181650 => 181651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp        2015-03-17 15:50:44 UTC (rev 181650)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp        2015-03-17 16:09:06 UTC (rev 181651)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx"> #include <WebCore/CacheValidation.h>
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/HTTPHeaderNames.h>
</span><ins>+#include <WebCore/NetworkStorageSession.h>
+#include <WebCore/PlatformCookieJar.h>
</ins><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -97,6 +99,17 @@
</span><span class="cx"> return { request.httpMethod(), partition, request.url().string() };
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+}
+
</ins><span class="cx"> static Storage::Entry encodeStorageEntry(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response, PassRefPtr<WebCore::SharedBuffer> responseData)
</span><span class="cx"> {
</span><span class="cx"> Encoder encoder;
</span><span class="lines">@@ -114,7 +127,8 @@
</span><span class="cx"> Vector<std::pair<String, String>> varyingRequestHeaders;
</span><span class="cx"> for (auto& varyHeaderName : varyingHeaderNames) {
</span><span class="cx"> String headerName = varyHeaderName.stripWhiteSpace();
</span><del>- varyingRequestHeaders.append(std::make_pair(headerName, request.httpHeaderField(headerName)));
</del><ins>+ String headerValue = headerValueForVary(request, headerName);
+ varyingRequestHeaders.append(std::make_pair(headerName, headerValue));
</ins><span class="cx"> }
</span><span class="cx"> encoder << varyingRequestHeaders;
</span><span class="cx"> }
</span><span class="lines">@@ -135,8 +149,8 @@
</span><span class="cx"> // FIXME: Vary: * in response would ideally trigger a cache delete instead of a store.
</span><span class="cx"> if (varyingRequestHeader.first == "*")
</span><span class="cx"> return false;
</span><del>- String requestValue = request.httpHeaderField(varyingRequestHeader.first);
- if (requestValue != varyingRequestHeader.second)
</del><ins>+ String headerValue = headerValueForVary(request, varyingRequestHeader.first);
+ if (headerValue != varyingRequestHeader.second)
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>