<!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>[178191] 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/178191">178191</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-09 12:59:05 -0800 (Fri, 09 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow HTTPS + 'Cache-control: no-store' sub-frames into the page cache
https://bugs.webkit.org/show_bug.cgi?id=140302
Reviewed by Andreas Kling.
Source/WebCore:
Allow HTTPS + 'Cache-control: no-store' sub-frames into the page cache.
We already restore 'no-store' sub-resources on history navigation from
the memory cache so there is no reason for our page cache policy to be
more restrictive.
We should align our memory cache / history navigation policy with our
page cache policy.
For now, 'no-store' main resources are not restored from either cache
(memory cache / page cache) on history navigation though. This behavior
does not change.
Test: http/tests/navigation/https-no-store-subframe-in-page-cache.html
* history/PageCache.cpp:
(WebCore::logCanCacheFrameDecision):
(WebCore::PageCache::canCachePageContainingThisFrame):
LayoutTests:
Add a layout test to make sure a page is restored from the page cache
on history navigation, even though its has an HTTPS sub-frame with
"cache-control: no-cache".
* http/tests/navigation/https-no-store-subframe-in-page-cache-expected.txt: Added.
* http/tests/navigation/https-no-store-subframe-in-page-cache.html: Added.
* http/tests/navigation/resources/https-no-store-subframe-in-page-cache.html: Added.
* http/tests/navigation/resources/no-store-frame.php: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsnavigationhttpsnostoresubframeinpagecacheexpectedtxt">trunk/LayoutTests/http/tests/navigation/https-no-store-subframe-in-page-cache-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsnavigationhttpsnostoresubframeinpagecachehtml">trunk/LayoutTests/http/tests/navigation/https-no-store-subframe-in-page-cache.html</a></li>
<li><a href="#trunkLayoutTestshttptestsnavigationresourceshttpsnostoresubframeinpagecachehtml">trunk/LayoutTests/http/tests/navigation/resources/https-no-store-subframe-in-page-cache.html</a></li>
<li><a href="#trunkLayoutTestshttptestsnavigationresourcesnostoreframephp">trunk/LayoutTests/http/tests/navigation/resources/no-store-frame.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178190 => 178191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-09 20:57:36 UTC (rev 178190)
+++ trunk/LayoutTests/ChangeLog 2015-01-09 20:59:05 UTC (rev 178191)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-09 Chris Dumez <cdumez@apple.com>
+
+ Allow HTTPS + 'Cache-control: no-store' sub-frames into the page cache
+ https://bugs.webkit.org/show_bug.cgi?id=140302
+
+ Reviewed by Andreas Kling.
+
+ Add a layout test to make sure a page is restored from the page cache
+ on history navigation, even though its has an HTTPS sub-frame with
+ "cache-control: no-cache".
+
+ * http/tests/navigation/https-no-store-subframe-in-page-cache-expected.txt: Added.
+ * http/tests/navigation/https-no-store-subframe-in-page-cache.html: Added.
+ * http/tests/navigation/resources/https-no-store-subframe-in-page-cache.html: Added.
+ * http/tests/navigation/resources/no-store-frame.php: Added.
+
</ins><span class="cx"> 2015-01-08 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Start removing Web Database support from workers
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsnavigationhttpsnostoresubframeinpagecacheexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/navigation/https-no-store-subframe-in-page-cache-expected.txt (0 => 178191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/navigation/https-no-store-subframe-in-page-cache-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/navigation/https-no-store-subframe-in-page-cache-expected.txt 2015-01-09 20:59:05 UTC (rev 178191)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+ALERT: This page is https and has has a subframe with the no-store cache-control directive. It should go in to the page cache.
+ALERT: PASS: The page was restored from the page cache. Good job!
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsnavigationhttpsnostoresubframeinpagecachehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/navigation/https-no-store-subframe-in-page-cache.html (0 => 178191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/navigation/https-no-store-subframe-in-page-cache.html (rev 0)
+++ trunk/LayoutTests/http/tests/navigation/https-no-store-subframe-in-page-cache.html 2015-01-09 20:59:05 UTC (rev 178191)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<script>
+
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+}
+
+if (location.protocol != "https:")
+ location = "https://127.0.0.1:8443/navigation/resources/https-no-store-subframe-in-page-cache.html";
+
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsnavigationresourceshttpsnostoresubframeinpagecachehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/navigation/resources/https-no-store-subframe-in-page-cache.html (0 => 178191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/navigation/resources/https-no-store-subframe-in-page-cache.html (rev 0)
+++ trunk/LayoutTests/http/tests/navigation/resources/https-no-store-subframe-in-page-cache.html 2015-01-09 20:59:05 UTC (rev 178191)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<iframe src="no-store-frame.php"></iframe>
+
+<script>
+window.onpageshow = function(evt)
+{
+ if (!evt.persisted)
+ return;
+
+ alert("PASS: The page was restored from the page cache. Good job!");
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+window.onload = function()
+{
+ if (window.sessionStorage.https_in_page_cache_started) {
+ alert("FAIL: The page was reloaded on back. It should NOT have been.");
+ if (window.testRunner)
+ testRunner.notifyDone();
+ return;
+ }
+
+ alert("This page is https and has has a subframe with the no-store cache-control directive. It should go in to the page cache.");
+ window.sessionStorage.https_in_page_cache_started = true;
+ setTimeout('window.location = "go-back.html"', 0);
+}
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsnavigationresourcesnostoreframephp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/navigation/resources/no-store-frame.php (0 => 178191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/navigation/resources/no-store-frame.php (rev 0)
+++ trunk/LayoutTests/http/tests/navigation/resources/no-store-frame.php 2015-01-09 20:59:05 UTC (rev 178191)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?php
+header("cache-control: no-store");
+?>
+TEST FRAME
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178190 => 178191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-09 20:57:36 UTC (rev 178190)
+++ trunk/Source/WebCore/ChangeLog 2015-01-09 20:59:05 UTC (rev 178191)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-01-09 Chris Dumez <cdumez@apple.com>
+
+ Allow HTTPS + 'Cache-control: no-store' sub-frames into the page cache
+ https://bugs.webkit.org/show_bug.cgi?id=140302
+
+ Reviewed by Andreas Kling.
+
+ Allow HTTPS + 'Cache-control: no-store' sub-frames into the page cache.
+ We already restore 'no-store' sub-resources on history navigation from
+ the memory cache so there is no reason for our page cache policy to be
+ more restrictive.
+
+ We should align our memory cache / history navigation policy with our
+ page cache policy.
+
+ For now, 'no-store' main resources are not restored from either cache
+ (memory cache / page cache) on history navigation though. This behavior
+ does not change.
+
+ Test: http/tests/navigation/https-no-store-subframe-in-page-cache.html
+
+ * history/PageCache.cpp:
+ (WebCore::logCanCacheFrameDecision):
+ (WebCore::PageCache::canCachePageContainingThisFrame):
+
</ins><span class="cx"> 2015-01-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to trigger a rebuild of generated JS bindings.
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (178190 => 178191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2015-01-09 20:57:36 UTC (rev 178190)
+++ trunk/Source/WebCore/history/PageCache.cpp 2015-01-09 20:59:05 UTC (rev 178191)
</span><span class="lines">@@ -135,7 +135,7 @@
</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().cacheControlContainsNoStore()) {
</del><ins>+ if (frame->isMainFrame() && frame->document()->url().protocolIs("https") && frame->loader().documentLoader()->response().cacheControlContainsNoStore()) {
</ins><span class="cx"> PCLOG(" -Frame is HTTPS, and cache control prohibits storing");
</span><span class="cx"> FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHTTPSNoStoreKey);
</span><span class="cx"> rejectReasons |= 1 << IsHttpsAndCacheControlled;
</span><span class="lines">@@ -315,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().cacheControlContainsNoStore())
</del><ins>+ && !(frame->isMainFrame() && 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>
</div>
</body>
</html>