[html5] r1048 - /

whatwg at whatwg.org whatwg at whatwg.org
Thu Oct 11 15:42:55 PDT 2007


Author: ianh
Date: 2007-10-11 15:42:54 -0700 (Thu, 11 Oct 2007)
New Revision: 1048

Modified:
   index
   source
Log:
[] (0) Note that a URI can have multiple categories. Move the <scheme> checking to the manifest and add() entry points, instead of the updater.

Modified: index
===================================================================
--- index	2007-10-11 22:00:13 UTC (rev 1047)
+++ index	2007-10-11 22:42:54 UTC (rev 1048)
@@ -25976,6 +25976,11 @@
       title=dom-appcache-add><a href="#adduri">add()</a></code> method.
     </dl>
 
+    <p class=note>A URI in the list can be flagged with multiple different
+     types, and thus an entry can end up being categorised as multiple
+     entries. For example, an entry can be an explicit entry and a dynamic
+     entry at the same time.</p>
+
    <li>Zero or more <dfn id=opportunistic
     title=concept-appcache-oppcache-ns>opportunistic caching
     namespaces</dfn>: URIs, used as <a href="#matches"
@@ -26245,9 +26250,14 @@
        of line".</p>
 
       <p>Otherwise, resolve the URI reference or IRI reference to an absolute
-       URI or IRI, drop any fragment identifier, and add this URI to the <var
-       title="">explicit URIs</var>.</p>
+       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>
+
+      <p>Otherwise, add this URI to the <var title="">explicit URIs</var>.</p>
+
      <dt>If <var title="">mode</var> is "fallback"
 
      <dd>
@@ -26282,6 +26292,10 @@
        scheme/host/port</a> as the manifest's URI, then jump back to the step
        labelled "start of line".</p>
       <!-- 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>
+
       <p>Otherwise, add the absolute URI or IRI corresponding to <var
        title="">part one</var> to the <var title="">fallback URIs</var>
        mapping as an <a href="#opportunistic"
@@ -26298,8 +26312,14 @@
        of line".</p>
 
       <p>Otherwise, resolve the URI reference or IRI reference to an absolute
-       URI or IRI, drop any fragment identifier, and add this URI to the <var
-       title="">online whitelist URIs</var>.</p>
+       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>
+
+      <p>Otherwise, add this URI to the <var title="">online whitelist
+       URIs</var>.</p>
     </dl>
 
    <li>
@@ -26534,11 +26554,7 @@
      progress information -->
 
      <li>
-      <p>If the resource's URI has a different <scheme> component than the
-       manifest's URI, then skip this resource.
-
-     <li>
-      <p>Otherwise, fetch the resource. If this is an <a href="#upgrade"
+      <p>Fetch the resource. If this is an <a href="#upgrade"
        title=concept-appcache-upgrade>upgrade attempt</a>, then use <var
        title="">cache</var> as an HTTP cache, and honour HTTP caching
        semantics (such as expiration, ETags, and so forth) with respect to
@@ -27034,6 +27050,11 @@
      these steps.
 
    <li>
+    <p>If <var title="">uri</var> has a different <scheme> component than
+     the manifest's URI, then raise a <a href="#security8">security
+     exception</a>.
+
+   <li>
     <p>Return, but do not abort these steps.
 
    <li>

Modified: source
===================================================================
--- source	2007-10-11 22:00:13 UTC (rev 1047)
+++ source	2007-10-11 22:42:54 UTC (rev 1048)
@@ -23588,6 +23588,13 @@
 
     </dl>
 
+    <p class="note">A URI in the list can be flagged with multiple
+    different types, and thus an entry can end up being categorised as
+    multiple entries. For example, an entry can be an explicit entry
+    and a dynamic entry at the same time.</p>
+
+   </li>
+
    <li>Zero or more <dfn
    title="concept-appcache-oppcache-ns">opportunistic caching
    namespaces</dfn>: URIs, used as <span
@@ -23866,9 +23873,15 @@
       "start of line".</p>
 
       <p>Otherwise, resolve the URI reference or IRI reference to an
-      absolute URI or IRI, drop any fragment identifier, and add this
-      URI to the <var title="">explicit URIs</var>.</p>
+      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>
+
+      <p>Otherwise, add this URI to the <var title="">explicit
+      URIs</var>.</p>
+
      </dd>
 
      <dt>If <var title="">mode</var> is "fallback"</dt>
@@ -23910,6 +23923,11 @@
       scheme/host/port</span> as the manifest's URI, then jump back to
       the step labelled "start of line".</p> <!-- 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>
+
       <p>Otherwise, add the absolute URI or IRI corresponding to <var
       title="">part one</var> to the <var title="">fallback URIs</var>
       mapping as an <span
@@ -23929,9 +23947,15 @@
       "start of line".</p>
 
       <p>Otherwise, resolve the URI reference or IRI reference to an
-      absolute URI or IRI, drop any fragment identifier, and add this
-      URI to the <var title="">online whitelist URIs</var>.</p>
+      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>
+
+      <p>Otherwise, add this URI to the <var title="">online whitelist
+      URIs</var>.</p>
+
      </dd>
 
     </dl>
@@ -24168,11 +24192,7 @@
      updating the application.</p></li> <!-- XXX need to include
      progress information -->
 
-     <li><p>If the resource's URI has a different <scheme>
-     component than the manifest's URI, then skip this
-     resource.</p></li>
-
-     <li><p>Otherwise, fetch the resource. If this is an <span
+     <li><p>Fetch the resource. If this is an <span
      title="concept-appcache-upgrade">upgrade attempt</span>, then use
      <var title="">cache</var> as an HTTP cache, and honour HTTP
      caching semantics (such as expiration, ETags, and so forth) with
@@ -24686,6 +24706,10 @@
    title="concept-appcache-dynamic">dynamic entry</span> and return
    and abort these steps.</p></li>
 
+   <li><p>If <var title="">uri</var> has a different <scheme>
+   component than the manifest's URI, then raise a <span>security
+   exception</span>.</p></li>
+
    <li><p>Return, but do not abort these steps.</p></li>
 
    <li><p>Fetch the resource referenced by <var




More information about the Commit-Watchers mailing list