<!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>[190468] branches/safari-601.1.46-branch</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/190468">190468</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-10-02 01:05:39 -0700 (Fri, 02 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/188755">r188755</a>. rdar://problem/22707467</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2NetworkProcesscacheNetworkCachecpp">branches/safari-601.1.46-branch/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (190467 => 190468)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-02 08:04:28 UTC (rev 190467)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-02 08:05:39 UTC (rev 190468)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-10-02 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188755.
+
+ 2015-08-21 Chris Dumez <cdumez@apple.com>
+
+ Regression(r188698): http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header.html is very flaky
+ https://bugs.webkit.org/show_bug.cgi?id=148205
+
+ Reviewed by Antti Koivisto.
+
+ * http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header.html:
+ Drop temporary fix landed in r188698 to make the test less flaky.
+
+2015-10-02 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r188690.
</span><span class="cx">
</span><span class="cx"> 2015-08-20 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (190467 => 190468)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-10-02 08:04:28 UTC (rev 190467)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-10-02 08:05:39 UTC (rev 190468)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-10-02 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188755.
+
+ 2015-08-21 Chris Dumez <cdumez@apple.com>
+
+ Regression(r188698): http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header.html is very flaky
+ https://bugs.webkit.org/show_bug.cgi?id=148205
+
+ Reviewed by Antti Koivisto.
+
+ After r188640, successful revalidation of resources in the memory cache
+ would cause us to drop the corresponding resource in the disk cache.
+ This patch addresses the issue by not removing the cache entry if the
+ response is a successful revalidation (i.e. status code == 304).
+
+ Longer term, we should probably update the entry in the disk cache (if
+ it exists) when it is revalidated by the memory cache. Currently,
+ revalidation by the memory cache bypasses the disk cache and goes
+ straight to the network. Then, when the response comes back as a 304,
+ we try and store the response in the cache. However, a 304 status code
+ is not cacheable so the cache rejects it.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::store):
+
+2015-10-02 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r188640.
</span><span class="cx">
</span><span class="cx"> 2015-08-19 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (190467 => 190468)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-10-02 08:04:28 UTC (rev 190467)
+++ branches/safari-601.1.46-branch/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-10-02 08:05:39 UTC (rev 190468)
</span><span class="lines">@@ -407,8 +407,11 @@
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) didn't store, storeDecision=%d", storeDecision);
</span><span class="cx"> auto key = makeCacheKey(originalRequest);
</span><span class="cx">
</span><del>- // Make sure we don't keep a stale entry in the cache.
- remove(key);
</del><ins>+ auto isSuccessfulRevalidation = response.httpStatusCode() == 304;
+ if (!isSuccessfulRevalidation) {
+ // Make sure we don't keep a stale entry in the cache.
+ remove(key);
+ }
</ins><span class="cx">
</span><span class="cx"> if (m_statistics)
</span><span class="cx"> m_statistics->recordNotCachingResponse(key, storeDecision);
</span></span></pre>
</div>
</div>
</body>
</html>