Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv14688
Modified Files:
offline.html spec.html
Log Message:
Support 'no-store' in appcache. This means we can now allow cross-origin HTTPS caching, too, without making things worse than the regular HTTP cache. (whatwg r6194)
[updated by splitter]
Index: offline.html
===================================================================
RCS file: /sources/public/html5/spec/offline.html,v
retrieving revision 1.1034
retrieving revision 1.1035
diff -u -d -r1.1034 -r1.1035
--- offline.html 4 Jun 2011 01:46:47 -0000 1.1034
+++ offline.html 7 Jun 2011 23:46:46 -0000 1.1035
@@ -378,11 +378,12 @@
files and make them available even when the user is offline.</p><p class="note">Authors are encouraged to include the main page in
the manifest also, but in practice the page that referenced the
manifest is automatically cached even if it isn't explicitly
- mentioned.</p><p class="note">HTTP cache headers and restrictions on caching pages
- served over TLS (encrypted, using <code title="">https:</code>) are
- overridden by manifests. Thus, pages will not expire from an
- application cache before the user agent has updated it, and even
- applications served over TLS can be made to work offline.</p><h5 id="appcacheevents"><span class="secno">5.6.1.1 </span>Event summary</h5><p><i>This section is non-normative.</i></p><p>When the user visits a page that declares a manifest, the browser
+ mentioned.</p><p class="note">With the exception of "no-store" directive, HTTP
+ cache headers and restrictions on caching pages served over TLS
+ (encrypted, using <code title="">https:</code>) are overridden by
+ manifests. Thus, pages will not expire from an application cache
+ before the user agent has updated it, and even applications served
+ over TLS can be made to work offline.</p><h5 id="appcacheevents"><span class="secno">5.6.1.1 </span>Event summary</h5><p><i>This section is non-normative.</i></p><p>When the user visits a page that declares a manifest, the browser
will try to update the cache. It does this by fetching a copy of the
manifest and, if the manifest has changed since the user agent last
saw it, redownloading all the resources it mentions and caching them
@@ -798,10 +799,7 @@
</dd></dl><p>Manifests may contain sections more than once. Sections may be
- empty.</p><p>If the manifest's <a href="urls.html#url-scheme" title="url-scheme">&lt;scheme&gt;</a>
- is <code title="">https:</code> or another scheme intended for
- encrypted data transfer, then all URLs in <a href="#concept-appcache-manifest-explicit" title="concept-appcache-manifest-explicit">explicit sections</a>
- must have the <a href="origin-0.html#same-origin">same origin</a> as the manifest itself.</p><p>URLs that are to be fallback pages associated with <a href="#concept-appcache-fallback-ns" title="concept-appcache-fallback-ns">fallback namespaces</a>, and
+ empty.</p><p>URLs that are to be fallback pages associated with <a href="#concept-appcache-fallback-ns" title="concept-appcache-fallback-ns">fallback namespaces</a>, and
those namespaces themselves, must be given in <a href="#concept-appcache-manifest-fallback" title="concept-appcache-manifest-fallback">fallback sections</a>,
with the namespace being the first URL of the data line, and the
corresponding fallback page being the second URL. All the other
@@ -973,10 +971,7 @@
<a href="urls.html#url-scheme" title="url-scheme">&lt;scheme&gt;</a> component than
the manifest's URL (compared in an <a href="infrastructure.html#ascii-case-insensitive">ASCII
case-insensitive</a> manner), then jump back to the step
- labeled "start of line". If the manifest's <a href="urls.html#url-scheme" title="url-scheme">&lt;scheme&gt;</a> is <code title="">https:</code> or another scheme intended for encrypted
- data transfer, and the resulting <a href="urls.html#absolute-url">absolute URL</a> does
- not have the <a href="origin-0.html#same-origin">same origin</a> as the manifest's URL,
- then jump back to the step labeled "start of line".</p>
+ labeled "start of line".</p>
<p>Drop the <a href="urls.html#url-fragment" title="url-fragment">&lt;fragment&gt;</a>
component of the resulting <a href="urls.html#absolute-url">absolute URL</a>, if it has
@@ -1325,7 +1320,7 @@
checking the magic signature), or if the server returned a
redirect, or if the resource is labeled with a <a href="infrastructure.html#mime-type">MIME
type</a> other than <code><a href="iana.html#text-cache-manifest">text/cache-manifest</a></code>, then run
- the <a href="#cache-failure-steps">cache failure steps</a>.</p>
+ the <a href="#cache-failure-steps">cache failure steps</a>. <a href="references.html#refsHTTP">[HTTP]</a></p>
</li>
@@ -1350,13 +1345,16 @@
entries</a>, wait for the resource for this entry to have
either completely downloaded or failed.</p>
- <p>If the download failed (e.g. the connection times out, or the
- user cancels the download), then create a <a href="webappapis.html#concept-task" title="concept-task">task</a> to <a href="webappapis.html#fire-a-simple-event">fire a simple
+ <p>If the download failed (e.g. the server returns a 4xx or 5xx
+ response <a href="fetching-resources.html#concept-http-equivalent-codes" title="concept-http-equivalent-codes">or
+ equivalent</a>, or there is a DNS error, the connection times
+ out, or the user cancels the download), or if the resource is
+ labeled with the "no-store" cache directive, then create a <a href="webappapis.html#concept-task" title="concept-task">task</a> to <a href="webappapis.html#fire-a-simple-event">fire a simple
event</a> that is cancelable named <code title="event-appcache-error"><a href="#event-appcache-error">error</a></code> at the
<code><a href="#applicationcache">ApplicationCache</a></code> singleton of the <a href="#cache-host">cache
host</a> the <code><a href="infrastructure.html#document">Document</a></code> for this entry, if there
- still is one, and append it to <var title="">task list</var>. The
- default action of this event must be, if the user agent
+ still is one, and append it to <var title="">task list</var>.
+ The default action of this event must be, if the user agent
<a href="#shows-caching-progress">shows caching progress</a>, the display of some sort of
user interface indicating to the user that the user agent failed
to save the application for offline use.</p>
@@ -1369,10 +1367,6 @@
be removed from the entry in <var title="">cache</var>
(application caches never include fragment identifiers).</p>
- <p class="note">HTTP caching rules, such as <code title="">Cache-Control: no-store</code>, are ignored for the
- purposes of the <a href="#application-cache-download-process">application cache download
- process</a>.</p>
-
</li>
<li><p>For each <a href="#cache-host">cache host</a> associated with an
@@ -1517,8 +1511,9 @@
5xx response <a href="fetching-resources.html#concept-http-equivalent-codes" title="concept-http-equivalent-codes">or
equivalent</a>, or there is a DNS error, or the connection
times out, or the user cancels the download), or if the server
- returned a redirect, then run the first appropriate step from
- the following list:</p>
+ returned a redirect, or if the resource is labeled with the
+ "no-store" cache directive, then run the first appropriate step
+ from the following list: <a href="references.html#refsHTTP">[HTTP]</a></p>
<dl class="switch"><dt>If the URL being processed was flagged as an "explicit
entry" or a "fallback entry"</dt>
@@ -1539,6 +1534,9 @@
<dt>If the error was a 404 or 410 HTTP response <a href="fetching-resources.html#concept-http-equivalent-codes" title="concept-http-equivalent-codes">or equivalent</a></dt>
+ <dt>If the resource was labeled with the "no-store" cache
+ directive</dt>
+
<dd>
<p>Skip this resource. It is dropped from the cache.</p>
@@ -1565,6 +1563,10 @@
without errors, and making non-manifest resources survive
server-side errors.</p>
+ <p class="note">Except for the "no-store" directive, HTTP
+ caching rules are ignored for the purposes of the
+ <a href="#application-cache-download-process">application cache download process</a>.</p>
+
</li>
<li>
@@ -1635,8 +1637,12 @@
entries</a>, wait for the resource for this entry to have
either completely downloaded or failed.</p>
- <p>If the download failed (e.g. the connection times out, or the
- user cancels the download), then run these substeps:</p>
+ <p>If the download failed (e.g. the server returns a 4xx or 5xx
+ response <a href="fetching-resources.html#concept-http-equivalent-codes" title="concept-http-equivalent-codes">or
+ equivalent</a>, or there is a DNS error, the connection times
+ out, or the user cancels the download), or if the resource is
+ labeled with the "no-store" cache directive, then run these
+ substeps:</p>
<ol><li><p>Unassociate the <code><a href="infrastructure.html#document">Document</a></code> for this entry from
<var title="">new cache</var>.</p></li>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1517
retrieving revision 1.1518
diff -u -d -r1.1517 -r1.1518
--- spec.html 7 Jun 2011 00:47:15 -0000 1.1517
+++ spec.html 7 Jun 2011 23:46:47 -0000 1.1518
@@ -322,7 +322,7 @@
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
- <h2 class="no-num no-toc" id="editor-s-draft-6-june-2011">Editor's Draft 6 June 2011</h2>
+ <h2 class="no-num no-toc" id="editor-s-draft-7-june-2011">Editor's Draft 7 June 2011</h2>
<dl><dt>Latest Published Version:</dt>
<dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
<dt>Latest Editor's Draft:</dt>
@@ -347,7 +347,7 @@
<a href="Overview.html">single page HTML</a>,
<a href="spec.html">multipage HTML</a>,
<a href="author/">web developer edition</a>.
-This is revision 1.4963.
+This is revision 1.4964.
</p>
<p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
&#169; 2011 <a href="http://www.w3.org/"><abbr title="World Wide
@@ -468,7 +468,7 @@
Group</a> is the W3C working group responsible for this
specification's progress along the W3C Recommendation
track.
- This specification is the 6 June 2011 Editor's Draft.
+ This specification is the 7 June 2011 Editor's Draft.
</p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>Work on this specification is also done at the <a href="http://www.whatwg.org/">WHATWG</a>. The W3C HTML working group
actively pursues convergence with the WHATWG, as required by the <a href="http://www.w3.org/2007/03/HTML-WG-charter">W3C HTML working
group charter</a>.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5