<!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>[177948] 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/177948">177948</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-05 20:50:06 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow HTTPS + 'Cache-control: no-cache' pages into the page cache
https://bugs.webkit.org/show_bug.cgi?id=139251
Reviewed by Darin Adler.
Source/WebCore:
Allow HTTPS + 'Cache-control: no-cache' pages into the page cache as
IE10+ and Google Chrome do, and as allowed by RFC2616 & newer RFC7234
(both RFCs distinguish history mechanisms and caches).
Pages over HTTPs using 'Cache-control: no-store' still don't go into
the page cache for now.
Test: http/tests/navigation/https-in-page-cache.html
* history/PageCache.cpp:
(WebCore::logCanCacheFrameDecision):
(WebCore::PageCache::canCachePageContainingThisFrame):
* platform/FeatureCounterKeys.h:
LayoutTests:
Update http/tests/navigation/https-in-page-cache.html layout test so that it
expects HTTPS + 'Cache-control: no-cache' pages to go into the page cache.
* http/tests/navigation/https-in-page-cache-expected.txt:
* http/tests/navigation/resources/https-in-page-cache-2.php:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsnavigationhttpsinpagecacheexpectedtxt">trunk/LayoutTests/http/tests/navigation/https-in-page-cache-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsnavigationresourceshttpsinpagecache2php">trunk/LayoutTests/http/tests/navigation/resources/https-in-page-cache-2.php</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformFeatureCounterKeysh">trunk/Source/WebCore/platform/FeatureCounterKeys.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177947 => 177948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-06 04:48:25 UTC (rev 177947)
+++ trunk/LayoutTests/ChangeLog 2015-01-06 04:50:06 UTC (rev 177948)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-01-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Allow HTTPS + 'Cache-control: no-cache' pages into the page cache
+ https://bugs.webkit.org/show_bug.cgi?id=139251
+
+ Reviewed by Darin Adler.
+
+ Update http/tests/navigation/https-in-page-cache.html layout test so that it
+ expects HTTPS + 'Cache-control: no-cache' pages to go into the page cache.
+
+ * http/tests/navigation/https-in-page-cache-expected.txt:
+ * http/tests/navigation/resources/https-in-page-cache-2.php:
+
+2015-01-05 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Using calc() in repeat() for -webkit-grid-template-rows does not work
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140094
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsnavigationhttpsinpagecacheexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/navigation/https-in-page-cache-expected.txt (177947 => 177948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/navigation/https-in-page-cache-expected.txt 2015-01-06 04:48:25 UTC (rev 177947)
+++ trunk/LayoutTests/http/tests/navigation/https-in-page-cache-expected.txt 2015-01-06 04:50:06 UTC (rev 177948)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> ALERT: This page is https and has the no-store cache-control directive. It should NOT go in to the page cache.
</span><span class="cx"> ALERT: The page was reloaded on back, not from the page cache. Good job. Running part 2 of the test.
</span><del>-ALERT: This page is https and has the no-cache cache-control directive. It should NOT go in to the page cache.
-ALERT: The page was reloaded on back, not from the page cache. Good job. Running part 3 of the test.
</del><ins>+ALERT: This page is https and has the no-cache cache-control directive. It should go in to the page cache.
+ALERT: The page was restored from the page cache. Good job!. Running part 3 of the test.
</ins><span class="cx"> ALERT: This page is https and should go in to the page cache.
</span><span class="cx"> ALERT: The page was restored from the page cache. Good job!
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsnavigationresourceshttpsinpagecache2php"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/navigation/resources/https-in-page-cache-2.php (177947 => 177948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/navigation/resources/https-in-page-cache-2.php 2015-01-06 04:48:25 UTC (rev 177947)
+++ trunk/LayoutTests/http/tests/navigation/resources/https-in-page-cache-2.php 2015-01-06 04:50:06 UTC (rev 177948)
</span><span class="lines">@@ -10,23 +10,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> window.onpageshow = function(evt) {
</span><del>- if (evt.persisted) {
- alert("The page was restored from the page cache. It should NOT have been. Running part 3 of the test.");
- nextTest();
- }
</del><ins>+ if (!evt.persisted)
+ return;
+
+ alert("The page was restored from the page cache. Good job!. Running part 3 of the test.");
+ nextTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> window.onload = function() {
</span><del>- if (window.sessionStorage.https_in_page_cache_started) {
- alert("The page was reloaded on back, not from the page cache. Good job. Running part 3 of the test.");
- nextTest();
- return;
- }
-
- alert("This page is https and has the no-cache cache-control directive. It should NOT go in to the page cache.");
</del><ins>+ alert("This page is https and has the no-cache cache-control directive. It should go in to the page cache.");
</ins><span class="cx"> window.sessionStorage.https_in_page_cache_started = true;
</span><span class="cx"> setTimeout('window.location = "go-back.html"', 0);
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-</script>
</del><span class="cx">\ No newline at end of file
</span><ins>+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177947 => 177948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-06 04:48:25 UTC (rev 177947)
+++ trunk/Source/WebCore/ChangeLog 2015-01-06 04:50:06 UTC (rev 177948)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-01-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Allow HTTPS + 'Cache-control: no-cache' pages into the page cache
+ https://bugs.webkit.org/show_bug.cgi?id=139251
+
+ Reviewed by Darin Adler.
+
+ Allow HTTPS + 'Cache-control: no-cache' pages into the page cache as
+ IE10+ and Google Chrome do, and as allowed by RFC2616 & newer RFC7234
+ (both RFCs distinguish history mechanisms and caches).
+
+ Pages over HTTPs using 'Cache-control: no-store' still don't go into
+ the page cache for now.
+
+ Test: http/tests/navigation/https-in-page-cache.html
+
+ * history/PageCache.cpp:
+ (WebCore::logCanCacheFrameDecision):
+ (WebCore::PageCache::canCachePageContainingThisFrame):
+ * platform/FeatureCounterKeys.h:
+
+2015-01-05 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Using calc() in repeat() for -webkit-grid-template-rows does not work
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140094
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (177947 => 177948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2015-01-06 04:48:25 UTC (rev 177947)
+++ trunk/Source/WebCore/history/PageCache.cpp 2015-01-06 04:50:06 UTC (rev 177948)
</span><span class="lines">@@ -135,14 +135,9 @@
</span><span class="cx"> FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHasPlugins);
</span><span class="cx"> rejectReasons |= 1 << HasPlugins;
</span><span class="cx"> }
</span><del>- if (frame->document()->url().protocolIs("https")
- && (frame->loader().documentLoader()->response().cacheControlContainsNoCache()
- || frame->loader().documentLoader()->response().cacheControlContainsNoStore())) {
- if (frame->loader().documentLoader()->response().cacheControlContainsNoCache())
- FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHTTPSNoCacheKey);
- if (frame->loader().documentLoader()->response().cacheControlContainsNoStore())
- FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHTTPSNoStoreKey);
- PCLOG(" -Frame is HTTPS, and cache control prohibits caching or storing");
</del><ins>+ if (frame->document()->url().protocolIs("https") && frame->loader().documentLoader()->response().cacheControlContainsNoStore()) {
+ PCLOG(" -Frame is HTTPS, and cache control prohibits storing");
+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHTTPSNoStoreKey);
</ins><span class="cx"> rejectReasons |= 1 << IsHttpsAndCacheControlled;
</span><span class="cx"> }
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="lines">@@ -320,7 +315,7 @@
</span><span class="cx"> // Do not cache error pages (these can be recognized as pages with substitute data or unreachable URLs).
</span><span class="cx"> && !(documentLoader->substituteData().isValid() && !documentLoader->substituteData().failingURL().isEmpty())
</span><span class="cx"> && (!frameLoader.subframeLoader().containsPlugins() || frame->page()->settings().pageCacheSupportsPlugins())
</span><del>- && (!document->url().protocolIs("https") || (!documentLoader->response().cacheControlContainsNoCache() && !documentLoader->response().cacheControlContainsNoStore()))
</del><ins>+ && !(document->url().protocolIs("https") && documentLoader->response().cacheControlContainsNoStore())
</ins><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> && !DatabaseManager::manager().hasOpenDatabases(document)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformFeatureCounterKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FeatureCounterKeys.h (177947 => 177948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-06 04:48:25 UTC (rev 177947)
+++ trunk/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-06 04:50:06 UTC (rev 177948)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> static const char FeatureCounterPageCacheFailureMainDocumentErrorKey[] = "com.apple.WebKit.pageCache.failure.mainDocumentError";
</span><span class="cx"> static const char FeatureCounterPageCacheFailureIsErrorPageKey[] = "com.apple.WebKit.pageCache.failure.isErrorPage";
</span><span class="cx"> static const char FeatureCounterPageCacheFailureHasPlugins[] = "com.apple.WebKit.pageCache.failure.hasPlugins";
</span><del>-static const char FeatureCounterPageCacheFailureHTTPSNoCacheKey[] = "com.apple.WebKit.pageCache.failure.httpsNoCache";
</del><span class="cx"> static const char FeatureCounterPageCacheFailureHTTPSNoStoreKey[] = "com.apple.WebKit.pageCache.failure.httpsNoStore";
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> static const char FeatureCounterPageCacheFailureHasOpenDatabasesKey[] = "com.apple.WebKit.pageCache.failure.hasOpenDatabases";
</span></span></pre>
</div>
</div>
</body>
</html>