<!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>[199061] 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/199061">199061</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-04-05 09:50:29 -0700 (Tue, 05 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>We sometimes fail to remove outdated entry from the disk cache after revalidation and when the resource is no longer cacheable
https://bugs.webkit.org/show_bug.cgi?id=156048
<rdar://problem/25514480>
Reviewed by Antti Koivisto.
Source/WebKit2:
We would sometimes fail to remove outdated entry from the disk cache
after revalidation and when the resource is no longer cacheable. This
was due to Storage::removeFromPendingWriteOperations() only removing
the first pending write operation with a given key instead of actually
removing all of the operations with this key.
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::removeFromPendingWriteOperations):
* NetworkProcess/cache/NetworkCacheStorage.h:
LayoutTests:
Add test coverage for the bug.
* http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes-expected.txt: Added.
* http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes.html: Added.
* http/tests/cache/disk-cache/resources/json.php: 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="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscachediskcachediskcacheremoveseveralpendingwritesexpectedtxt">trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscachediskcachediskcacheremoveseveralpendingwriteshtml">trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes.html</a></li>
<li><a href="#trunkLayoutTestshttptestscachediskcacheresourcesjsonphp">trunk/LayoutTests/http/tests/cache/disk-cache/resources/json.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199060 => 199061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-05 16:45:51 UTC (rev 199060)
+++ trunk/LayoutTests/ChangeLog 2016-04-05 16:50:29 UTC (rev 199061)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-05 Chris Dumez <cdumez@apple.com>
+
+ We sometimes fail to remove outdated entry from the disk cache after revalidation and when the resource is no longer cacheable
+ https://bugs.webkit.org/show_bug.cgi?id=156048
+ <rdar://problem/25514480>
+
+ Reviewed by Antti Koivisto.
+
+ Add test coverage for the bug.
+
+ * http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes-expected.txt: Added.
+ * http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes.html: Added.
+ * http/tests/cache/disk-cache/resources/json.php: Added.
+
</ins><span class="cx"> 2016-04-05 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Shadow DOM: :host() From The First Shadow Context Should Not Style All Shadow Context
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcachediskcacheremoveseveralpendingwritesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes-expected.txt (0 => 199061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes-expected.txt 2016-04-05 16:50:29 UTC (rev 199061)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+Make sure that we properly remove cached entry if the entry is no longer cacheable after revalidation
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+200: {"version":1}
+200: {"version":1}
+404: {"not":"found"}
+200: {"version":2}
+200: {"version":2}
+PASS bugReproduced is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcachediskcacheremoveseveralpendingwriteshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes.html (0 => 199061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes.html (rev 0)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes.html 2016-04-05 16:50:29 UTC (rev 199061)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<body>
+<script src="/js-test-resources/js-test-pre.js"></script>
+<script>
+description("Make sure that we properly remove cached entry if the entry is no longer cacheable after revalidation");
+jsTestIsAsync = true;
+
+var id = Math.floor((Math.random() * 1000000000000));
+var bugReproduced = true;
+
+function fetch(url) {
+ return new Promise(function (resolve, reject) {
+ var xhr = new XMLHttpRequest(url);
+ xhr.onerror = reject;
+ xhr.onload = function () {
+ resolve({status: xhr.status, body: JSON.parse(xhr.responseText)});
+ };
+ xhr.open('GET', url);
+ xhr.send();
+ })
+}
+
+function fetchResource() {
+ return fetch('resources/json.php?id=' + id).then(function (resp) {
+ if (resp.body.version === 2) {
+ bugReproduced = false;
+ }
+ debug(resp.status + ': ' + JSON.stringify(resp.body));
+ });
+}
+
+onload = function() {
+ fetchResource()
+ .then(fetchResource)
+ .then(fetchResource)
+ .then(fetchResource)
+ .then(fetchResource)
+ .then(function () {
+ shouldBeFalse("bugReproduced");
+ finishJSTest();
+ })
+ .catch(console.log.bind(console));
+}
+
+</script>
+<script src="/js-test-resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcacheresourcesjsonphp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/disk-cache/resources/json.php (0 => 199061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/resources/json.php (rev 0)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/resources/json.php 2016-04-05 16:50:29 UTC (rev 199061)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<?php
+
+function send304()
+{
+ header("HTTP/1.1 304 Not Modified");
+ header("ETag: foo");
+}
+
+$id = $_GET["id"];
+$count = 1;
+if (isset($_COOKIE[$id])) {
+ $count = $_COOKIE[$id];
+}
+
+setcookie($id, $count + 1);
+
+if ($count == 1) {
+ header("Cache-Control: must-revalidate");
+ header("ETag: foo");
+ header("Content-Type: application/json");
+ echo '{"version": 1}';
+} else if ($count == 2) {
+ send304();
+} else if ($count == 3) {
+ header("HTTP/1.1 404 Not Found");
+ header("Cache-Control: must-revalidate");
+ header("Content-Type: application/json");
+ echo '{"not": "found"}';
+} else if ($count == 4) {
+ if ($_SERVER["HTTP_IF_NONE_MATCH"] == "foo") {
+ send304();
+ } else {
+ header("Cache-Control: must-revalidate");
+ header("ETag: foo");
+ header("Content-Type: application/json");
+ echo '{"version": 2}';
+ }
+} else {
+ send304();
+}
+
+?>
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199060 => 199061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-05 16:45:51 UTC (rev 199060)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-05 16:50:29 UTC (rev 199061)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-04-05 Chris Dumez <cdumez@apple.com>
+
+ We sometimes fail to remove outdated entry from the disk cache after revalidation and when the resource is no longer cacheable
+ https://bugs.webkit.org/show_bug.cgi?id=156048
+ <rdar://problem/25514480>
+
+ Reviewed by Antti Koivisto.
+
+ We would sometimes fail to remove outdated entry from the disk cache
+ after revalidation and when the resource is no longer cacheable. This
+ was due to Storage::removeFromPendingWriteOperations() only removing
+ the first pending write operation with a given key instead of actually
+ removing all of the operations with this key.
+
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::removeFromPendingWriteOperations):
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+
</ins><span class="cx"> 2016-04-05 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL2] Allow enabling WebGL2 with a runtime flag
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (199060 => 199061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2016-04-05 16:45:51 UTC (rev 199060)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2016-04-05 16:50:29 UTC (rev 199061)
</span><span class="lines">@@ -523,16 +523,18 @@
</span><span class="cx"> return { headerData };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Storage::removeFromPendingWriteOperations(const Key& key)
</del><ins>+void Storage::removeFromPendingWriteOperations(const Key& key)
</ins><span class="cx"> {
</span><del>- auto end = m_pendingWriteOperations.end();
- for (auto it = m_pendingWriteOperations.begin(); it != end; ++it) {
- if ((*it)->record.key == key) {
- m_pendingWriteOperations.remove(it);
- return true;
- }
</del><ins>+ while (true) {
+ auto found = m_pendingWriteOperations.findIf([&key](const std::unique_ptr<WriteOperation>& operation) {
+ return operation->record.key == key;
+ });
+
+ if (found == m_pendingWriteOperations.end())
+ break;
+
+ m_pendingWriteOperations.remove(found);
</ins><span class="cx"> }
</span><del>- return false;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Storage::remove(const Key& key)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (199060 => 199061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2016-04-05 16:45:51 UTC (rev 199060)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2016-04-05 16:50:29 UTC (rev 199061)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> void readRecord(ReadOperation&, const Data&);
</span><span class="cx">
</span><span class="cx"> void updateFileModificationTime(const String& path);
</span><del>- bool removeFromPendingWriteOperations(const Key&);
</del><ins>+ void removeFromPendingWriteOperations(const Key&);
</ins><span class="cx">
</span><span class="cx"> WorkQueue& ioQueue() { return m_ioQueue.get(); }
</span><span class="cx"> WorkQueue& backgroundIOQueue() { return m_backgroundIOQueue.get(); }
</span></span></pre>
</div>
</div>
</body>
</html>