html5/spec offline.html,1.1036,1.1037 spec.html,1.1546,1.1547

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv20864

Modified Files:
	offline.html spec.html 
Log Message:
appcache: only allow text/cache-manifest with no parameters or with a charset=utf-8 parameter. (whatwg r6251)

[updated by splitter]


Index: offline.html
===================================================================
RCS file: /sources/public/html5/spec/offline.html,v
retrieving revision 1.1036
retrieving revision 1.1037
diff -u -d -r1.1036 -r1.1037
--- offline.html	13 Jun 2011 23:46:52 -0000	1.1036
+++ offline.html	17 Jun 2011 00:47:32 -0000	1.1037
@@ -1246,11 +1246,12 @@
     flag</i> set, and let <var title="">manifest</var> be that
     resource.</p> 
     <p>If the resource is labeled with the <a href="infrastructure.html#mime-type">MIME type</a>
-    <code><a href="iana.html#text-cache-manifest">text/cache-manifest</a></code>, parse <var title="">manifest</var> according to the <a href="#parse-a-manifest" title="parse a
-    manifest">rules for parsing manifests</a>, obtaining a list of
-    <a href="#concept-appcache-explicit" title="concept-appcache-explicit">explicit entries</a>,
-    <a href="#concept-appcache-fallback" title="concept-appcache-fallback">fallback entries</a>
-    and the <a href="#concept-appcache-fallback-ns" title="concept-appcache-fallback-ns">fallback
+    <code><a href="iana.html#text-cache-manifest">text/cache-manifest</a></code>, either with no parameters or
+    with a single parameter with the name "<code title="">charset</code>" whose value is an <a href="infrastructure.html#ascii-case-insensitive">ASCII
+    case-insensitive</a> match for the string "<code title="">utf-8</code>", parse <var title="">manifest</var>
+    according to the <a href="#parse-a-manifest" title="parse a manifest">rules for parsing
+    manifests</a>, obtaining a list of <a href="#concept-appcache-explicit" title="concept-appcache-explicit">explicit entries</a>, <a href="#concept-appcache-fallback" title="concept-appcache-fallback">fallback entries</a> and the
+    <a href="#concept-appcache-fallback-ns" title="concept-appcache-fallback-ns">fallback
     namespaces</a> that map to them, entries for the <a href="#concept-appcache-onlinewhitelist" title="concept-appcache-onlinewhitelist">online whitelist</a>,
     and a value for the <a href="#concept-appcache-onlinewhitelist-wildcard" title="concept-appcache-onlinewhitelist-wildcard">online whitelist
     wildcard flag</a>.</p>
@@ -1319,8 +1320,9 @@
     cancels the download, or the parser for manifests fails when
     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>. <a href="references.html#refsHTTP">[HTTP]</a></p>
+    type</a> other than <code><a href="iana.html#text-cache-manifest">text/cache-manifest</a></code> or has
+    parameters that do not match the conditions listed earlier, then
+    run the <a href="#cache-failure-steps">cache failure steps</a>. <a href="references.html#refsHTTP">[HTTP]</a></p>
 
    </li>
 

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1546
retrieving revision 1.1547
diff -u -d -r1.1546 -r1.1547
--- spec.html	16 Jun 2011 23:46:52 -0000	1.1546
+++ spec.html	17 Jun 2011 00:47:41 -0000	1.1547
@@ -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-16-june-2011">Editor's Draft 16 June 2011</h2>
+   <h2 class="no-num no-toc" id="editor-s-draft-17-june-2011">Editor's Draft 17 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.5012.
+This is revision 1.5013.
    </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 16 June 2011 Editor's Draft.
+  This specification is the 17 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

Received on Friday, 17 June 2011 00:47:55 UTC