Permalink
Browse files

[gw] (2) appcache: Always allow cross-scheme networking to work unaff…

…ected. Clarify rules about syntax of manifests regarding schemes and the like.

git-svn-id: http://svn.whatwg.org/webapps@3606 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information...
1 parent 01cb70f commit a7f9368f4d178fe38714a8fbd36e7accea60d28f @Hixie Hixie committed Aug 14, 2009
Showing with 41 additions and 22 deletions.
  1. +19 −11 index
  2. +22 −11 source
View
30 index
@@ -50094,10 +50094,10 @@ style/default.css</pre>
<h5 id=writing-cache-manifests><span class=secno>6.9.3.2 </span>Writing cache manifests</h5>
<p>Manifests must be served using the
- <code><a href=#text/cache-manifest>text/cache-manifest</a></code> <a href=#mime-type>MIME type</a>. All resources served
- using the <code><a href=#text/cache-manifest>text/cache-manifest</a></code> <a href=#mime-type>MIME type</a> must follow the
- syntax of application cache manifests, as described in this
- section.</p>
+ <code><a href=#text/cache-manifest>text/cache-manifest</a></code> <a href=#mime-type>MIME type</a>. All
+ resources served using the <code><a href=#text/cache-manifest>text/cache-manifest</a></code>
+ <a href=#mime-type>MIME type</a> must follow the syntax of application cache
+ manifests, as described in this section.</p>
<p>An application cache manifest is a text file, whose text is
encoded using UTF-8. Data in application cache manifests is
@@ -50169,10 +50169,16 @@ style/default.css</pre>
<p>The format that data lines must take depends on the current
section.</p>
- <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, either a
- single U+002A ASTERISK character (*) <!--
+ <p>When the current section is the explicit section, data lines
+ must consist of zero or more U+0020 SPACE and U+0009 CHARACTER
+ TABULATION (tab) characters, a <a href=#valid-url>valid URL</a> identifying
+ a resource other than the manifest itself, and then zero or more
+ U+0020 SPACE and U+0009 CHARACTER TABULATION (tab) characters.</p>
+
+ <p>When the current section is the online whitelist section, data
+ lines must consist of zero or more U+0020 SPACE and U+0009
+ CHARACTER TABULATION (tab) characters, either a single U+002A
+ ASTERISK character (*) <!--
concept-appcache-onlinewhitelist-wildcard --> or a <a href=#valid-url>valid
URL</a> identifying a resource other than the manifest itself,
and then zero or more U+0020 SPACE and U+0009 CHARACTER TABULATION
@@ -50216,7 +50222,9 @@ style/default.css</pre>
concept-appcache-onlinewhitelist-wildcard --></p>
<p>Relative URLs must be given relative to the manifest's own
- URL.</p>
+ URL. All URLs in the manifest must have the same <a href=#url-scheme title=url-scheme>&lt;scheme&gt;</a> as the manifest itself
+ (either explicitly or implicitly, through the use of relative
+ URLs).</p>
<p>URLs in manifests must not have fragment identifiers (i.e. the
U+0023 NUMBER SIGN character isn't allowed in URLs in
@@ -51218,8 +51226,8 @@ style/default.css</pre>
<ol><li><p>If the resource is not to be fetched using the HTTP GET
mechanism <a href=#concept-http-equivalent-get title=concept-http-equivalent-get>or
- equivalent</a>, or if it has a <a href=#javascript-protocol title="javascript
- protocol"><code title="">javascript:</code> URL</a>, then
+ equivalent</a>, or if its <a href=#url>URL</a> has a different <a href=#url-scheme title=url-scheme>&lt;scheme&gt;</a> component than the
+ <a href=#application-cache>application cache</a>'s <a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a>, then
<a href=#fetch>fetch</a> the resource normally and abort these
steps.</li>
View
33 source
@@ -56652,10 +56652,10 @@ style/default.css</pre>
<h5>Writing cache manifests</h5>
<p>Manifests must be served using the
- <code>text/cache-manifest</code> <span>MIME type</span>. All resources served
- using the <code>text/cache-manifest</code> <span>MIME type</span> must follow the
- syntax of application cache manifests, as described in this
- section.</p>
+ <code>text/cache-manifest</code> <span>MIME type</span>. All
+ resources served using the <code>text/cache-manifest</code>
+ <span>MIME type</span> must follow the syntax of application cache
+ manifests, as described in this section.</p>
<p>An application cache manifest is a text file, whose text is
encoded using UTF-8. Data in application cache manifests is
@@ -56734,10 +56734,16 @@ style/default.css</pre>
<p>The format that data lines must take depends on the current
section.</p>
- <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, either a
- single U+002A ASTERISK character (*) <!--
+ <p>When the current section is the explicit section, data lines
+ must consist of zero or more U+0020 SPACE and U+0009 CHARACTER
+ TABULATION (tab) characters, a <span>valid URL</span> identifying
+ a resource other than the manifest itself, and then zero or more
+ U+0020 SPACE and U+0009 CHARACTER TABULATION (tab) characters.</p>
+
+ <p>When the current section is the online whitelist section, data
+ lines must consist of zero or more U+0020 SPACE and U+0009
+ CHARACTER TABULATION (tab) characters, either a single U+002A
+ ASTERISK character (*) <!--
concept-appcache-onlinewhitelist-wildcard --> or a <span>valid
URL</span> identifying a resource other than the manifest itself,
and then zero or more U+0020 SPACE and U+0009 CHARACTER TABULATION
@@ -56786,7 +56792,10 @@ style/default.css</pre>
concept-appcache-onlinewhitelist-wildcard --></p>
<p>Relative URLs must be given relative to the manifest's own
- URL.</p>
+ URL. All URLs in the manifest must have the same <span
+ title="url-scheme">&lt;scheme&gt;</span> as the manifest itself
+ (either explicitly or implicitly, through the use of relative
+ URLs).</p>
<p>URLs in manifests must not have fragment identifiers (i.e. the
U+0023 NUMBER SIGN character isn't allowed in URLs in
@@ -57973,8 +57982,10 @@ style/default.css</pre>
<li><p>If the resource is not to be fetched using the HTTP GET
mechanism <span title="concept-http-equivalent-get">or
- equivalent</span>, or if it has a <span title="javascript
- protocol"><code title="">javascript:</code> URL</span>, then
+ equivalent</span>, or if its <span>URL</span> has a different <span
+ title="url-scheme">&lt;scheme&gt;</span> component than the
+ <span>application cache</span>'s <span
+ title="concept-appcache-manifest">manifest</span>, then
<span>fetch</span> the resource normally and abort these
steps.</p></li>

0 comments on commit a7f9368

Please sign in to comment.