<!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>[181895] 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/181895">181895</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-24 09:50:55 -0700 (Tue, 24 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] NetworkCache retrievals fail for entries with no body
https://bugs.webkit.org/show_bug.cgi?id=142979
<rdar://problem/20264100>
Reviewed by Antti Koivisto.
Source/WebKit2:
NetworkCache retrievals were failing for entries with no body because
decodeEntry() doesn't correctly handle this case. In particular, the
following check fails:
"metaData.bodyOffset + metaData.bodySize == fileData.size()".
This is because bodyOffset is pageSize-aligned.
As a result, the following resource on apple.com is stored in the cache
but we fail to reuse it and reload it from the network every time:
http://images.apple.com/home/styles/promos.css
This patch updates decodeEntry() to create a null Data object for the
body if bodySize is 0.
* NetworkProcess/cache/NetworkCacheDataCocoa.mm:
(WebKit::NetworkCache::Data::data):
Do not attempt to initialize m_data if m_dispatchData is null as the
call to dispatch_data_create_map() would then crash. We now return
null in this case. This is needed as decodeStorageEntry() in
NetworkCache.cpp constructs a SharedBuffer from
storageEntry.body.data() and the body may be null.
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::decodeEntry):
LayoutTests:
Add network disk cache validation test for resources that have no body
(only headers).
* http/tests/cache/disk-cache/disk-cache-validation-no-body-expected.txt: Added.
* http/tests/cache/disk-cache/disk-cache-validation-no-body.html: Added.
* http/tests/cache/disk-cache/resources/generate-response-no-body.cgi: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataCocoamm">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscachediskcachediskcachevalidationnobodyexpectedtxt">trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-no-body-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscachediskcachediskcachevalidationnobodyhtml">trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-no-body.html</a></li>
<li><a href="#trunkLayoutTestshttptestscachediskcacheresourcesgenerateresponsenobodycgi">trunk/LayoutTests/http/tests/cache/disk-cache/resources/generate-response-no-body.cgi</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (181894 => 181895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-24 16:44:19 UTC (rev 181894)
+++ trunk/LayoutTests/ChangeLog 2015-03-24 16:50:55 UTC (rev 181895)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-03-24 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ [WK2] NetworkCache retrievals fail for entries with no body
+ https://bugs.webkit.org/show_bug.cgi?id=142979
+ <rdar://problem/20264100>
+
+ Reviewed by Antti Koivisto.
+
+ Add network disk cache validation test for resources that have no body
+ (only headers).
+
+ * http/tests/cache/disk-cache/disk-cache-validation-no-body-expected.txt: Added.
+ * http/tests/cache/disk-cache/disk-cache-validation-no-body.html: Added.
+ * http/tests/cache/disk-cache/resources/generate-response-no-body.cgi: Added.
+
+2015-03-24 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> [WK2] The WebKit network cache does not cache responses with "Content-Disposition: attachment" header
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142989
</span><span class="cx"> <rdar://problem/20265992>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcachediskcachevalidationnobodyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-no-body-expected.txt (0 => 181895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-no-body-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-no-body-expected.txt 2015-03-24 16:50:55 UTC (rev 181895)
</span><span class="lines">@@ -0,0 +1,902 @@
</span><ins>+Test permutations of various cache headers
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+running 243 tests
+
+response headers: undefined
+response source: Network
+
+response headers: {"Cache-control":"max-age=0"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100"}
+response source: Disk cache
+
+response headers: {"Expires":"now(0)"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(0)"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(0)"}
+response source: Disk cache
+
+response headers: {"Expires":"now(100)"}
+response source: Disk cache
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(100)"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(100)"}
+response source: Disk cache
+
+response headers: {"Cache-control":"no-store"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-store"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-store"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)"}
+response source: Network
+
+response headers: {"Cache-control":"no-cache"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-cache"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-cache"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)"}
+response source: Network
+
+response headers: {"ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=0","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=100","ETag":"match"}
+response source: Disk cache
+
+response headers: {"Expires":"now(0)","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(0)","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(0)","ETag":"match"}
+response source: Disk cache
+
+response headers: {"Expires":"now(100)","ETag":"match"}
+response source: Disk cache
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(100)","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(100)","ETag":"match"}
+response source: Disk cache
+
+response headers: {"Cache-control":"no-store","ETag":"match"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","ETag":"match"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","ETag":"match"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-store","ETag":"match"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)","ETag":"match"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)","ETag":"match"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-store","ETag":"match"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)","ETag":"match"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)","ETag":"match"}
+response source: Network
+
+response headers: {"Cache-control":"no-cache","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Expires":"now(0)","Cache-control":"no-cache","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Expires":"now(100)","Cache-control":"no-cache","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)","ETag":"match"}
+response source: Disk cache after validation
+
+response headers: {"ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","ETag":"nomatch"}
+response source: Disk cache
+
+response headers: {"Expires":"now(0)","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(0)","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(0)","ETag":"nomatch"}
+response source: Disk cache
+
+response headers: {"Expires":"now(100)","ETag":"nomatch"}
+response source: Disk cache
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(100)","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(100)","ETag":"nomatch"}
+response source: Disk cache
+
+response headers: {"Cache-control":"no-store","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-store","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-store","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"no-cache","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-cache","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-cache","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)","ETag":"nomatch"}
+response source: Network
+
+response headers: {"Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache
+
+response headers: {"Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache
+
+response headers: {"Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache
+
+response headers: {"Cache-control":"no-store","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-store","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-store","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"no-cache","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-cache","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-cache","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=0","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=100","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache
+
+response headers: {"Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache
+
+response headers: {"Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache
+
+response headers: {"Cache-control":"no-store","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-store","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-store","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"no-cache","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Expires":"now(0)","Cache-control":"no-cache","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Expires":"now(100)","Cache-control":"no-cache","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache after validation
+
+response headers: {"ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache
+
+response headers: {"Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache
+
+response headers: {"Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Disk cache
+
+response headers: {"Cache-control":"no-store","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-store","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-store","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"no-cache","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-cache","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-cache","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"en"}
+response source: Network
+
+response headers: {"Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"no-store","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-store","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-store","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"no-cache","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-cache","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-cache","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"no-store","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-store","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-store","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"no-cache","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-cache","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-cache","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)","ETag":"match","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0","Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100","Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"no-store","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-store","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-store","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"no-cache","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(0)","Cache-control":"no-cache","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Expires":"now(100)","Cache-control":"no-cache","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)","ETag":"nomatch","Vary":"Accept-Language"}
+request headers: {"Accept-Language":"unique()"}
+response source: Network
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcachediskcachevalidationnobodyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-no-body.html (0 => 181895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-no-body.html (rev 0)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-no-body.html 2015-03-24 16:50:55 UTC (rev 181895)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<script src="/js-test-resources/js-test-pre.js"></script>
+<script src="resources/cache-test.js"></script>
+<body>
+<script>
+
+var testMatrix =
+[
+ [
+ {},
+ { responseHeaders: {'Cache-control': 'max-age=0' } },
+ { responseHeaders: {'Cache-control': 'max-age=100' } },
+ ],
+ [
+ {},
+ { responseHeaders: {'Expires': 'now(0)' } },
+ { responseHeaders: {'Expires': 'now(100)' } },
+ ],
+ [
+ {},
+ { responseHeaders: {'Cache-control': 'no-store' } },
+ { responseHeaders: {'Cache-control': 'no-cache' } },
+ ],
+ [
+ {},
+ { responseHeaders: {'ETag': 'match' } },
+ { responseHeaders: {'ETag': 'nomatch' } },
+ ],
+ [
+ {},
+ { responseHeaders: {'Vary': 'Accept-Language' }, requestHeaders: { 'Accept-Language': 'en' } },
+ { responseHeaders: {'Vary': 'Accept-Language' }, requestHeaders: { 'Accept-Language': 'unique()' } },
+ ],
+ ];
+
+description("Test permutations of various cache headers");
+
+var tests = generateTests(testMatrix, false /* withBody */);
+
+debug("running " + tests.length + " tests");
+debug("");
+
+runTests(tests);
+
+</script>
+<script src="/js-test-resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcacheresourcesgenerateresponsenobodycgi"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/disk-cache/resources/generate-response-no-body.cgi (0 => 181895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/resources/generate-response-no-body.cgi (rev 0)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/resources/generate-response-no-body.cgi 2015-03-24 16:50:55 UTC (rev 181895)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+#!/usr/bin/perl -w
+
+use CGI;
+use HTTP::Date;
+
+my $query = new CGI;
+@names = $query->param;
+
+if ($query->http && $query->http("If-None-Match") eq "match") {
+ print "Status: 304\n";
+}
+
+foreach (@names) {
+ next if ($_ eq "uniqueId");
+ print $_ . ": " . $query->param($_) . "\n";
+}
+print "\n";
</ins><span class="cx">Property changes on: trunk/LayoutTests/http/tests/cache/disk-cache/resources/generate-response-no-body.cgi
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181894 => 181895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-24 16:44:19 UTC (rev 181894)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-24 16:50:55 UTC (rev 181895)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2015-03-24 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ [WK2] NetworkCache retrievals fail for entries with no body
+ https://bugs.webkit.org/show_bug.cgi?id=142979
+ <rdar://problem/20264100>
+
+ Reviewed by Antti Koivisto.
+
+ NetworkCache retrievals were failing for entries with no body because
+ decodeEntry() doesn't correctly handle this case. In particular, the
+ following check fails:
+ "metaData.bodyOffset + metaData.bodySize == fileData.size()".
+ This is because bodyOffset is pageSize-aligned.
+
+ As a result, the following resource on apple.com is stored in the cache
+ but we fail to reuse it and reload it from the network every time:
+ http://images.apple.com/home/styles/promos.css
+
+ This patch updates decodeEntry() to create a null Data object for the
+ body if bodySize is 0.
+
+ * NetworkProcess/cache/NetworkCacheDataCocoa.mm:
+ (WebKit::NetworkCache::Data::data):
+ Do not attempt to initialize m_data if m_dispatchData is null as the
+ call to dispatch_data_create_map() would then crash. We now return
+ null in this case. This is needed as decodeStorageEntry() in
+ NetworkCache.cpp constructs a SharedBuffer from
+ storageEntry.body.data() and the body may be null.
+
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::decodeEntry):
+
+2015-03-24 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> [WK2] The WebKit network cache does not cache responses with "Content-Disposition: attachment" header
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142989
</span><span class="cx"> <rdar://problem/20265992>
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm (181894 => 181895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm 2015-03-24 16:44:19 UTC (rev 181894)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm 2015-03-24 16:50:55 UTC (rev 181895)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> const uint8_t* Data::data() const
</span><span class="cx"> {
</span><del>- if (!m_data) {
</del><ins>+ if (!m_data && m_dispatchData) {
</ins><span class="cx"> const void* data;
</span><span class="cx"> size_t size;
</span><span class="cx"> m_dispatchData = adoptDispatch(dispatch_data_create_map(m_dispatchData.get(), &data, &size));
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (181894 => 181895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-03-24 16:44:19 UTC (rev 181894)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-03-24 16:50:55 UTC (rev 181895)
</span><span class="lines">@@ -212,18 +212,22 @@
</span><span class="cx">
</span><span class="cx"> if (metaData.key != key)
</span><span class="cx"> return nullptr;
</span><del>- if (metaData.bodyOffset + metaData.bodySize != fileData.size())
- return nullptr;
</del><span class="cx">
</span><del>- auto bodyData = mapFile(fd, metaData.bodyOffset, metaData.bodySize);
- if (bodyData.isNull()) {
- LOG(NetworkCacheStorage, "(NetworkProcess) map failed");
- return nullptr;
- }
</del><ins>+ Data bodyData;
+ if (metaData.bodySize) {
+ if (metaData.bodyOffset + metaData.bodySize != fileData.size())
+ return nullptr;
</ins><span class="cx">
</span><del>- if (metaData.bodyChecksum != hashData(bodyData)) {
- LOG(NetworkCacheStorage, "(NetworkProcess) data checksum mismatch");
- return nullptr;
</del><ins>+ bodyData = mapFile(fd, metaData.bodyOffset, metaData.bodySize);
+ if (bodyData.isNull()) {
+ LOG(NetworkCacheStorage, "(NetworkProcess) map failed");
+ return nullptr;
+ }
+
+ if (metaData.bodyChecksum != hashData(bodyData)) {
+ LOG(NetworkCacheStorage, "(NetworkProcess) data checksum mismatch");
+ return nullptr;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return std::make_unique<Storage::Entry>(Storage::Entry {
</span></span></pre>
</div>
</div>
</body>
</html>