[html5] r1211 - /
whatwg at whatwg.org
whatwg at whatwg.org
Mon Feb 11 01:01:30 PST 2008
Author: ianh
Date: 2008-02-11 01:01:29 -0800 (Mon, 11 Feb 2008)
New Revision: 1211
Modified:
index
source
Log:
[g] (2) Fix some errors with the syntax and parsing algorithm for offline cache manifests.
Modified: index
===================================================================
--- index 2008-02-10 22:21:51 UTC (rev 1210)
+++ index 2008-02-11 09:01:29 UTC (rev 1211)
@@ -24,7 +24,7 @@
<h1 id=html-5>HTML 5</h1>
- <h2 class="no-num no-toc" id=working>Working Draft — 10 February
+ <h2 class="no-num no-toc" id=working>Working Draft — 11 February
2008</h2>
<p>You can take part in this work. <a
@@ -27109,17 +27109,24 @@
<p>When the current section is the explicit section or the online
whitelist section, data lines must consist of zero or more U+0020 SPACE
and U+0009 CHARACTER TABULATION (tab) characters, a valid URI reference
- or IRI reference, and then zero or more U+0020 SPACE and U+0009
- CHARACTER TABULATION (tab) characters. <a
- href="#refsRFC3986">[RFC3986]</a> <a href="#refsRFC3987">[RFC3987]</a></p>
+ or IRI reference to a resource other than the manifest itself, and then
+ zero or more U+0020 SPACE and U+0009 CHARACTER TABULATION (tab)
+ characters. <a href="#refsRFC3986">[RFC3986]</a> <a
+ href="#refsRFC3987">[RFC3987]</a></p>
<p>When the current section is the fallback section, data lines must
consist of zero or more U+0020 SPACE and U+0009 CHARACTER TABULATION
- (tab) characters, a valid URI reference or IRI reference, one or more
- U+0020 SPACE and U+0009 CHARACTER TABULATION (tab) characters, another
- valid URI reference or IRI reference, and then zero or more U+0020 SPACE
- and U+0009 CHARACTER TABULATION (tab) characters. <a
- href="#refsRFC3986">[RFC3986]</a> <a href="#refsRFC3987">[RFC3987]</a></p>
+ (tab) characters, a valid URI reference or IRI reference to a resource
+ other than the manifest itself, one or more U+0020 SPACE and U+0009
+ CHARACTER TABULATION (tab) characters, another valid URI reference or
+ IRI reference to a resource other than the manifest itself, and then
+ zero or more U+0020 SPACE and U+0009 CHARACTER TABULATION (tab)
+ characters. <a href="#refsRFC3986">[RFC3986]</a> <a
+ href="#refsRFC3987">[RFC3987]</a></p>
+
+ <p class=note>The URI or IRI references in data lines can't be empty
+ strings, since those would be relative URIs to the manifest itself. Such
+ lines would be confused with blank or invalid lines, anyway.</p>
</dl>
<p>Manifests may contain sections more than once. Sections may be empty.
@@ -27232,14 +27239,18 @@
characters, and let the result be <var title="">line</var>.
<li>
+ <p>Drop any trailing U+0020 SPACE, or U+0009 CHARACTER TABULATION (tab)
+ characters at the end of <var title="">line</var>.
+
+ <li>
+ <p>If <var title="">line</var> is the empty string, then jump back to the
+ step labelled "start of line".
+
+ <li>
<p>If the first character in <var title="">line</var> is a U+0023 NUMBER
SIGN (#) character, then jump back to the step labelled "start of line".
<li>
- <p>Drop any trailing U+0020 SPACE, or U+0009 CHARACTER TABULATION (tab)
- characters at the end of <var title="">line</var>.
-
- <li>
<p>If <var title="">line</var> equals "CACHE:" (the word "CACHE" followed
by a U+003A COLON (:) character), then set <var title="">mode</var> to
"explicit" and jump back to the step labelled "start of line".
@@ -27271,8 +27282,9 @@
URI or IRI, and drop the fragment identifier, if any.</p>
<p>Now, if the resource's URI has a different <scheme> component
- than the manifest's URI, then jump back to the step labelled "start of
- line".</p>
+ than the manifest's URI (compared
+ case-insensitively<!-- XXX ASCII -->), then jump back to the step
+ labelled "start of line".</p>
<p>Otherwise, add this URI to the <var title="">explicit URIs</var>.</p>
@@ -27312,7 +27324,9 @@
<!-- SECURITY -->
<p>If the absolute URI or IRI corresponding to <var title="">part
two</var> has a different <scheme> component than the manifest's
- URI, then jump back to the step labelled "start of line".</p>
+ URI (compared case-insensitively<!-- XXX
+ ASCII -->), then jump
+ back to the step labelled "start of line".</p>
<p>Otherwise, add the absolute URI or IRI corresponding to <var
title="">part one</var> to the <var title="">fallback URIs</var>
Modified: source
===================================================================
--- source 2008-02-10 22:21:51 UTC (rev 1210)
+++ source 2008-02-11 09:01:29 UTC (rev 1211)
@@ -24629,20 +24629,28 @@
<p>When the current section is the explicit section or the online
whitelist section, data lines must consist of zero or more U+0020
SPACE and U+0009 CHARACTER TABULATION (tab) characters, a valid
- URI reference or IRI reference, and then zero or more U+0020 SPACE
- and U+0009 CHARACTER TABULATION (tab) characters. <a
+ URI reference or IRI reference to a resource other than the
+ manifest itself, and then zero or more U+0020 SPACE and U+0009
+ CHARACTER TABULATION (tab) characters. <a
href="#refsRFC3986">[RFC3986]</a> <a
href="#refsRFC3987">[RFC3987]</a></p>
<p>When the current section is the fallback section, data lines
must consist of zero or more U+0020 SPACE and U+0009 CHARACTER
TABULATION (tab) characters, a valid URI reference or IRI
- reference, one or more U+0020 SPACE and U+0009 CHARACTER
- TABULATION (tab) characters, another valid URI reference or IRI
- reference, and then zero or more U+0020 SPACE and U+0009 CHARACTER
- TABULATION (tab) characters. <a href="#refsRFC3986">[RFC3986]</a>
- <a href="#refsRFC3987">[RFC3987]</a></p>
+ reference to a resource other than the manifest itself, one or
+ more U+0020 SPACE and U+0009 CHARACTER TABULATION (tab)
+ characters, another valid URI reference or IRI reference to a
+ resource other than the manifest itself, and then zero or more
+ U+0020 SPACE and U+0009 CHARACTER TABULATION (tab) characters. <a
+ href="#refsRFC3986">[RFC3986]</a> <a
+ href="#refsRFC3987">[RFC3987]</a></p>
+ <p class="note">The URI or IRI references in data lines can't be
+ empty strings, since those would be relative URIs to the manifest
+ itself. Such lines would be confused with blank or invalid lines,
+ anyway.</p>
+
</dl>
<p>Manifests may contain sections more than once. Sections may be
@@ -24752,14 +24760,17 @@
characters, and let the result be <var
title="">line</var>.</p></li>
+ <li><p>Drop any trailing U+0020 SPACE, or U+0009 CHARACTER
+ TABULATION (tab) characters at the end of <var
+ title="">line</var>.</p></li>
+
+ <li><p>If <var title="">line</var> is the empty string, then jump
+ back to the step labelled "start of line".</p></li>
+
<li><p>If the first character in <var title="">line</var> is a
U+0023 NUMBER SIGN (#) character, then jump back to the step
labelled "start of line".</p></li>
- <li><p>Drop any trailing U+0020 SPACE, or U+0009 CHARACTER
- TABULATION (tab) characters at the end of <var
- title="">line</var>.</p></li>
-
<li><p>If <var title="">line</var> equals "CACHE:" (the word
"CACHE" followed by a U+003A COLON (:) character), then set <var
title="">mode</var> to "explicit" and jump back to the step
@@ -24793,8 +24804,9 @@
absolute URI or IRI, and drop the fragment identifier, if any.</p>
<p>Now, if the resource's URI has a different <scheme>
- component than the manifest's URI, then jump back to the step
- labelled "start of line".</p>
+ component than the manifest's URI (compared
+ case-insensitively<!-- XXX ASCII -->), then jump back to the
+ step labelled "start of line".</p>
<p>Otherwise, add this URI to the <var title="">explicit
URIs</var>.</p>
@@ -24842,8 +24854,9 @@
<p>If the absolute URI or IRI corresponding to <var
title="">part two</var> has a different <scheme> component
- than the manifest's URI, then jump back to the step labelled
- "start of line".</p>
+ than the manifest's URI (compared case-insensitively<!-- XXX
+ ASCII -->), then jump back to the step labelled "start of
+ line".</p>
<p>Otherwise, add the absolute URI or IRI corresponding to <var
title="">part one</var> to the <var title="">fallback URIs</var>
More information about the Commit-Watchers
mailing list