<!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>[170949] trunk/Source/WebCore</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/170949">170949</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-09 20:11:26 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Curl] Cache entry invalidated too early.
https://bugs.webkit.org/show_bug.cgi?id=134681
Patch by peavo@outlook.com <peavo@outlook.com> on 2014-07-09
Reviewed by Alex Christensen.
When a cache entry has expired, it is invalidated when a request for the corresponding url is started.
This is too early, since the resource is possibly not modified (even though it has expired),
and the server might respond with a 304 (not modified) response.
When we then receive a 304 response, the cache entry is deleted, and we have no cached response/data to provide.
This can be solved by not invalidating the entry when a request for that url is started,
but instead invalidate when a 200 OK response is received (which means the resource has been modified).
* platform/network/curl/CurlCacheManager.cpp:
(WebCore::CurlCacheManager::isCached): Avoid invalidating cache entry when it has expired, wait until we know the server response.
* platform/network/curl/CurlCacheManager.h: Added const modifier.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlCacheManagercpp">trunk/Source/WebCore/platform/network/curl/CurlCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlCacheManagerh">trunk/Source/WebCore/platform/network/curl/CurlCacheManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170948 => 170949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-10 02:18:30 UTC (rev 170948)
+++ trunk/Source/WebCore/ChangeLog 2014-07-10 03:11:26 UTC (rev 170949)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-07-09 peavo@outlook.com <peavo@outlook.com>
+
+ [Curl] Cache entry invalidated too early.
+ https://bugs.webkit.org/show_bug.cgi?id=134681
+
+ Reviewed by Alex Christensen.
+
+ When a cache entry has expired, it is invalidated when a request for the corresponding url is started.
+ This is too early, since the resource is possibly not modified (even though it has expired),
+ and the server might respond with a 304 (not modified) response.
+ When we then receive a 304 response, the cache entry is deleted, and we have no cached response/data to provide.
+ This can be solved by not invalidating the entry when a request for that url is started,
+ but instead invalidate when a 200 OK response is received (which means the resource has been modified).
+
+ * platform/network/curl/CurlCacheManager.cpp:
+ (WebCore::CurlCacheManager::isCached): Avoid invalidating cache entry when it has expired, wait until we know the server response.
+ * platform/network/curl/CurlCacheManager.h: Added const modifier.
+
</ins><span class="cx"> 2014-07-09 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert r170413 and r170390
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlCacheManager.cpp (170948 => 170949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlCacheManager.cpp 2014-07-10 02:18:30 UTC (rev 170948)
+++ trunk/Source/WebCore/platform/network/curl/CurlCacheManager.cpp 2014-07-10 03:11:26 UTC (rev 170949)
</span><span class="lines">@@ -236,18 +236,15 @@
</span><span class="cx"> it->value->didFinishLoading();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CurlCacheManager::isCached(const String& url)
</del><ins>+bool CurlCacheManager::isCached(const String& url) const
</ins><span class="cx"> {
</span><span class="cx"> if (m_disabled)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> auto it = m_index.find(url);
</span><del>- if (it != m_index.end()) {
- if (it->value->isCached())
- return !it->value->isLoading();
</del><ins>+ if (it != m_index.end())
+ return it->value->isCached() && !it->value->isLoading();
</ins><span class="cx">
</span><del>- invalidateCacheEntry(url);
- }
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlCacheManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlCacheManager.h (170948 => 170949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlCacheManager.h 2014-07-10 02:18:30 UTC (rev 170948)
+++ trunk/Source/WebCore/platform/network/curl/CurlCacheManager.h 2014-07-10 03:11:26 UTC (rev 170949)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> const String& cacheDirectory() { return m_cacheDir; }
</span><span class="cx"> void setStorageSizeLimit(size_t);
</span><span class="cx">
</span><del>- bool isCached(const String&);
</del><ins>+ bool isCached(const String&) const;
</ins><span class="cx"> HTTPHeaderMap& requestHeaders(const String&); // Load headers
</span><span class="cx"> bool getCachedResponse(const String& url, ResourceResponse&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>