spec/Overview.html 1.1511 2338 Remove opportunistic caching; leave only

Remove opportunistic caching; leave only the fallback feature. (whatwg
r2338)

5.3 Origin
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#origin
list of event sources
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#concept-eventsource-list
online whitelist namespaces
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#concept-appcache-onlinewhitelist
cache attempt
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#concept-appcache-cache
cache failure steps
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#cache-failure-steps
5.7.4 Updating an application cache
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#updating-an-application-cache
removeEventSource(src)
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#dom-remoteeventtarget-removeeventsource
5.7.3.2 Writing cache manifests
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#writing-cache-manifests
matches a fallback namespace
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#concept-appcache-matches-fallback
fallback namespaces
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#concept-appcache-fallback-ns
7.2.2 Connecting to an event stream
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#connecting-to-an-event-stream
Fragment identifiers: If the absolute URL of the new resource is the same as the address of the active document of the browsing context being navigated, ignoring any <fragment> components of those URLs, and the new resource is to be fetched using HTTP GET or equivalent, then navigate to that fragment identifier and abort these steps.
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#navigate-fragid-step
Dynamic entries
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#concept-appcache-dynamic
application cache update process
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#application-cache-update-process
Fallback entries
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#concept-appcache-fallback
5.7.5.1 Changes to the networking model
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#changesToNetworkingModel
Status of this document
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#status-of-this-document
A vocabulary and associated APIs for HTML and XHTML
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#a-vocabulary-and-associated-apis-for-html-and-xhtml
5.7.5 Processing model
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#processing-model-1
5.6.2.1 Security and privacy
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#security-and-privacy
Editor's Draft 16 October 2008
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#editor-s-draft-date-zzz-9-june-2008
5.7.3.3 Parsing cache manifests
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1511.html#parsing-cache-manifests

http://people.w3.org/mike/diffs/html5/spec/Overview.diff.html
http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.1510&r2=1.1511&f=h
http://html5.org/tools/web-apps-tracker?from=2337&to=2338

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.1510
retrieving revision 1.1511
diff -u -d -r1.1510 -r1.1511
--- Overview.html 15 Oct 2008 23:44:45 -0000 1.1510
+++ Overview.html 16 Oct 2008 00:33:23 -0000 1.1511
@@ -8,7 +8,7 @@
    <p><a href=http://www.w3.org/><img alt=W3C height=48 src=http://www.w3.org/Icons/w3c_home width=72></a></p>
    <h1>HTML 5</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-date-zzz-9-june-2008><!-- "W3C Working Draft" --> Editor's Draft <!--ZZZ-->15 October 2008</h2>
+   <h2 class="no-num no-toc" id=editor-s-draft-date-zzz-9-june-2008><!-- "W3C Working Draft" --> Editor's Draft <!--ZZZ-->16 October 2008</h2>
    <dl><!-- ZZZ: update the month/day
     <dt>This Version:</dt>
     <dd><a href="http://www.w3.org/TR/2008/WD-html5-20080610/">http://www.w3.org/TR/2008/WD-html5-20080610/</a></dd>
@@ -97,7 +97,7 @@
   specification's progress along the W3C Recommendation
   track.
   <!--ZZZ:-->
-  This specification is the 15 October 2008 <!--ZZZ "Working Draft"-->Editor's Draft.
+  This specification is the 16 October 2008 <!--ZZZ "Working Draft"-->Editor's Draft.
   <!--:ZZZ-->
   </p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- relationship to other work (required) --><p>This specification is also being produced by the <a href=http://www.whatwg.org/>WHATWG</a>. The two specifications are
   identical from the table of contents onwards.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- context and rationale (required) --><p>This specification is intended to replace (be a new version of)
@@ -25663,8 +25663,7 @@
      URL</a>, then return a new globally unique
      identifier.</li>
 
-     <li><p>Let <var title="">scheme</var> be the <a href=#url-scheme title=url-scheme>&lt;scheme&gt;</a> component of the URI,
-     <a href=#converted-to-lowercase>converted to lowercase</a>.</li>
+     <li><p>Let <var title="">scheme</var> be the <a href=#url-scheme title=url-scheme>&lt;scheme&gt;</a> component of <var title="">url</var>, <a href=#converted-to-lowercase>converted to lowercase</a>.</li>
 
      <li><p>If the UA doesn't support the protocol given by <var title="">scheme</var>, then return a new globally unique
      identifier.</li>
@@ -27233,7 +27232,7 @@
    a document that uses that content type.</li>
 
    <li>The user agent contacts the third party and hands the third
-   party the URI to the Intranet content.</li>
+   party the URL to the Intranet content.</li>
 
   </ol><p>No actual confidential file data is leaked in this manner, but
   the URLs themselves could contain confidential information. For
@@ -27366,13 +27365,6 @@
      entries.
 
  
-     <dt><dfn id=concept-appcache-oppcache title=concept-appcache-oppcache>Opportunistically cached entries</dfn>
-
-     <dd>Resources whose URLs <a href=#concept-appcache-matches-oppcache title=concept-appcache-matches-oppcache>matched</a> an <a href=#concept-appcache-oppcache-ns title=concept-appcache-oppcache-ns>opportunistic caching
-     namespace</a> when they were fetched, and were therefore
-     cached in the application cache.
-
- 
      <dt><dfn id=concept-appcache-dynamic title=concept-appcache-dynamic>Dynamic entries</dfn>
 
      <dd>Resources that were added to the cache by the <code title=dom-appcache-add><a href=#dom-appcache-add>add()</a></code> method.
@@ -27384,14 +27376,13 @@
 
    </li>
 
-   <li>Zero or more <dfn id=concept-appcache-oppcache-ns title=concept-appcache-oppcache-ns>opportunistic caching
-   namespaces</dfn>: URLs, used as <a href=#concept-appcache-matches-oppcache title=concept-appcache-matches-oppcache>prefix match
+   <li>Zero or more <dfn id=concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback
+   namespaces</dfn>: URLs, used as <a href=#concept-appcache-matches-fallback title=concept-appcache-matches-fallback>prefix match
    patterns</a>, each of which is mapped to a <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entry</a>. Each
-   namespace URL prefix, when parsed as a URL, has the <a href=#same-origin>same
-   origin</a> as <a href=#concept-appcache-manifest title=concept-appcache-manifest>the
-   manifest</a>.</li>
+   namespace URL has the <a href=#same-origin>same origin</a> as <a href=#concept-appcache-manifest title=concept-appcache-manifest>the manifest</a>.</li>
 
-   <li>Zero or more URLs that form the <dfn id=concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist</dfn>.
+   <li>Zero or more URLs that form the <dfn id=concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist
+   namespaces</dfn>.
 
   </ul><p>Multiple application caches can contain the same resource,
   e.g. if their manifests all reference that resource. If the user
@@ -27513,21 +27504,17 @@
     lines would be confused with blank or invalid lines, anyway.</p>
 
   </dl><p>Manifests may contain sections more than once. Sections may be
-  empty.<p>URLs that are to be fallback pages associated with <a href=#concept-appcache-oppcache-ns title=concept-appcache-oppcache-ns>opportunistic caching
-  namespaces</a>, and those namespaces themselves, must be given in
-  fallback sections, with the namespace being the first URL of the
-  data line, and the corresponding fallback page being the second
-  URL. All the other pages to be cached must be listed in explicit
-  sections.<p><a href=#concept-appcache-oppcache-ns title=concept-appcache-oppcache-ns>Opportunistic caching
+  empty.<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 fallback sections,
+  with the namespace being the first URL of the data line, and the
+  corresponding fallback page being the second URL. All the other
+  pages to be cached must be listed in explicit sections.<p><a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>Fallback
   namespaces</a> must have the <a href=#same-origin>same origin</a> as the
-  manifest itself.<p>An opportunistic caching namespace must not be listed more than
-  once.<p>URLs that the user agent is to put into the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist</a>
+  manifest itself.<p>A <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback
+  namespace</a> must not be listed more than once.<p>URLs that the user agent is to put into the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist</a>
   must all be specified in online whitelist sections. (This is needed
   for any URL that the page is intending to use to communicate back to
-  the server.)<p>URLs in the online whitelist section must not also be listed in
-  explicit section, and must not be listed as fallback entries in the
-  fallback section. (URLs in the online whitelist section may match
-  opportunistic caching namespaces, however.)<p>Relative URLs must be given relative to the manifest's own
+  the server.)<p>Relative URLs must be given relative to the manifest's own
   URL.<p>URLs in manifests must not have fragment identifiers (i.e. the
   U+0023 NUMBER SIGN character isn't allowed in URLs in
   manifests).<h5 id=parsing-cache-manifests><span class=secno>5.7.3.3 </span>Parsing cache manifests</h5><p>When a user agent is to <dfn id=parse-a-manifest>parse a manifest</dfn>, it means
@@ -27544,8 +27531,8 @@
    entries</a>.</li>
 
    <li><p>Let <var title="">fallback URLs</var> be an initially empty
-   mapping of <a href=#concept-appcache-oppcache-ns title=concept-appcache-oppcache-ns>opportunistic
-   caching namespaces</a> to <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entries</a>.</li>
+   mapping of <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback
+   namespaces</a> to <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entries</a>.</li>
 
    <li><p>Let <var title="">online whitelist URLs</var> be an
    initially empty list of URLs for a <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
@@ -27706,15 +27693,13 @@
       resulting <a href=#absolute-url title="absolute URL">absolute URLs</a>.</p>
 
       <p>If the <a href=#absolute-url>absolute URL</a> corresponding to <var title="">part one</var> is already in the <var title="">fallback
-      URIs</var> mapping as an <a href=#concept-appcache-oppcache-ns title=concept-appcache-oppcache-ns>opportunistic caching
-      namespace</a>, then jump back to the step labeled "start of
-      line".</p>
+      URLs</var> mapping as a <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback namespace</a>,
+      then jump back to the step labeled "start of line".</p>
 
       <p>Otherwise, add the <a href=#absolute-url>absolute URL</a> corresponding to
       <var title="">part one</var> to the <var title="">fallback
-      URIs</var> mapping as an <a href=#concept-appcache-oppcache-ns title=concept-appcache-oppcache-ns>opportunistic caching
-      namespace</a>, mapped to the <a href=#absolute-url>absolute URL</a>
-      corresponding to <var title="">part two</var> as the <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entry</a>.</p>
+      URLs</var> mapping as a <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback namespace</a>,
+      mapped to the <a href=#absolute-url>absolute URL</a> corresponding to <var title="">part two</var> as the <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entry</a>.</p>
 
      </dd>
 
@@ -27759,12 +27744,11 @@
    <li><p>Return the <var title="">explicit URLs</var> list, the <var title="">fallback URLs</var> mapping, and the <var title="">online
    whitelist URLs</var>.</li>
 
-  </ol><p class=note>If a resource is listed in both the online whitelist
-  and in the explicit section, then that resource will be fetched and
-  cached, but when the page tries to use this resource, the user agent
-  will ignore the cached copy and attempt to fetch the file from the
-  network. Indeed, the cached copy will only be used if it is opened
-  from a top-level browsing context.<h4 id=updating-an-application-cache><span class=secno>5.7.4 </span>Updating an application cache</h4><p>When the user agent is required (by other parts of this
+  </ol><p class=note>If a resource is listed in the explicit section and
+  matches an entry in the online whitelist, or if a resource matches
+  both an entry in the fallback section and the online whitelist, the
+  resource will taken from the cache, and the online whitelist entry
+  will be ignored.<h4 id=updating-an-application-cache><span class=secno>5.7.4 </span>Updating an application cache</h4><p>When the user agent is required (by other parts of this
   specification) to start the <dfn id=application-cache-update-process>application cache update
   process</dfn>, the user agent must run the following steps:<p class=XXX>the event stuff needs to be more consistent --
   something about showing every step of the ui or no steps or
@@ -27826,9 +27810,8 @@
     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-oppcache-ns title=concept-appcache-oppcache-ns>opportunistic
-    caching namespaces</a> that map to them, and entries for the
-    <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
+    and the <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback
+    namespaces</a> that map to them, and entries for the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
     whitelist</a>.</p>
 
    </li>
@@ -27901,13 +27884,6 @@
    list</var>, each flagged with "fallback entry".</li>
 
    <li><p>If this is an <a href=#concept-appcache-upgrade title=concept-appcache-upgrade>upgrade
-   attempt</a>, then add all the URLs of <a href=#concept-appcache-oppcache title=concept-appcache-oppcache>opportunistically cached
-   entries</a> in <var title="">cache</var> that <a href=#concept-appcache-matches-oppcache title=concept-appcache-matches-oppcache>match</a> the <a href=#concept-appcache-oppcache-ns title=concept-appcache-oppcache-ns>opportunistic caching
-   namespaces</a> obtained by parsing <var title="">manifest</var>
-   to <var title="">file list</var>, each flagged with "opportunistic
-   entry".</li>
-
-   <li><p>If this is an <a href=#concept-appcache-upgrade title=concept-appcache-upgrade>upgrade
    attempt</a>, then add all the URLs of <a href=#concept-appcache-implicit title=concept-appcache-implicit>implicit entries</a> in <var title="">cache</var> to <var title="">file list</var>, each flagged
    with "implicit entry".</li>
 
@@ -27975,11 +27951,6 @@
      entry as a <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback
      entry</a>.</li>
 
-     <li><p>If the URL being processed was flagged as a "opportunistic
-     entry" in <var title="">file list</var>, then categorize the
-     entry as an <a href=#concept-appcache-oppcache title=concept-appcache-oppcache>opportunistically cached
-     entry</a>.</li>
-
      <li><p>If the URL being processed was flagged as an "implicit
      entry" in <var title="">file list</var>, then categorize the
      entry as a <a href=#concept-appcache-implicit title=concept-appcache-implicit>implicit
@@ -27996,8 +27967,8 @@
    cache</var>, if it's not there already, and categorize this entry
    (whether newly added or not) as <a href=#concept-appcache-manifest title=concept-appcache-manifest>the manifest</a>.</li>
 
-   <li><p>Store the list of <a href=#concept-appcache-oppcache-ns title=concept-appcache-oppcache-ns>opportunistic caching
-   namespaces</a>, and the URLs of the <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entries</a> that they
+   <li><p>Store the list of <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback namespaces</a>,
+   and the URLs of the <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entries</a> that they
    map to, in the new cache.</li>
 
    <li><p>Store the URLs that form the new <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist</a> in
@@ -28077,22 +28048,22 @@
 
   </ol><h4 id=processing-model-1><span class=secno>5.7.5 </span>Processing model</h4><p>The processing model of application caches for offline support in
   Web applications is part of the <a href=#navigate title=navigate>navigation</a> model, but references the
-  algorithms defined in this section.<p>A URL <dfn id=concept-appcache-matches-oppcache title=concept-appcache-matches-oppcache>matches an
-  opportunistic caching namespace</dfn> if there exists an
-  <a href=#application-cache>application cache</a> whose <a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a>'s URL has the
+  algorithms defined in this section.<p>A URL <dfn id=concept-appcache-matches-fallback title=concept-appcache-matches-fallback>matches a
+  fallback namespace</dfn> if there exists an <a href=#application-cache>application
+  cache</a> whose <a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a>'s URL has the
   <a href=#same-origin>same origin</a> as the URL in question, and if that
-  application cache has an <a href=#concept-appcache-oppcache-ns title=concept-appcache-oppcache-ns>opportunistic caching
-  namespace</a> with a <a href=#url-path title=url-path>&lt;path&gt;</a>
-  component that exactly matches the start of the <a href=#url-path title=url-path>&lt;path&gt;</a> component of the URL being
-  examined. If multiple opportunistic caching namespaces match the
-  same URL, the one with the longest &lt;path&gt; component is the one
-  that matches. A URL looking for an opportunistic caching namespace
-  can match more than one application cache at a time, but only
-  matches one namespace in each cache.<div class=example>
+  application cache has a <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback namespace</a> with
+  a <a href=#url-path title=url-path>&lt;path&gt;</a> component that is a
+  <a href=#prefix-match>prefix match</a> for the <a href=#url-path title=url-path>&lt;path&gt;</a> component of the URL being
+  examined. If multiple fallback namespaces match the same URL, the
+  one with the longest <a href=#url-path title=url-path>&lt;path&gt;</a> component is the one
+  that matches. A URL looking for an fallback namespace can match more
+  than one application cache at a time, but only matches one namespace
+  in each cache.<div class=example>
 
    <p>If a manifest <code title="">http://example.com/app1/manifest</code> declares that
-   <code title="">http://example.com/resources/images</code> should be
-   opportunistically cached, and the user navigates to <code title="">http://example.com/resources/images/cat.png</code>, then
+   <code title="">http://example.com/resources/images</code> is a
+   fallback namespace, and the user navigates to <code title="">http://example.com/resources/images/cat.png</code>, then
    the user agent will decide that the application cache identified by
    <code title="">http://example.com/app1/manifest</code> contains a
    namespace with a match for that URL.</p>
@@ -28224,37 +28195,34 @@
    mechanism or equivalent, then <a href=#fetch>fetch</a> the resource
    normally and abort these steps.</li>
 
-   <li><p>If the resource's URL is <a href=#concept-appcache-implicit title=concept-appcache-implicit>an implicit entry</a>, <a href=#concept-appcache-manifest title=concept-appcache-manifest>the manifest</a>, <a href=#concept-appcache-explicit title=concept-appcache-explicit>an explicit entry</a>, <a href=#concept-appcache-fallback title=concept-appcache-fallback>a fallback entry</a>, <a href=#concept-appcache-oppcache title=concept-appcache-oppcache>an opportunistically cached
-   entry</a>, or a <a href=#concept-appcache-dynamic title=concept-appcache-dynamic>dynamic
-   entry</a> in the <a href=#application-cache>application cache</a>, then get the
-   resource from the cache (instead of fetching it), and abort these
-   steps.</li>
-
-   <li><p>If there is an entry in the <a href=#application-cache>application cache</a>'s
-   <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
-   whitelist</a> that has the <a href=#same-origin>same origin</a> as the
-   resource's URL and that is a <a href=#prefix-match>prefix match</a> for the
-   resource's URL, then <a href=#fetch>fetch</a> the resource normally and
-   abort these steps.</li>
+   <li><p>If the resource's URL is <a href=#concept-appcache-implicit title=concept-appcache-implicit>an implicit entry</a>, <a href=#concept-appcache-manifest title=concept-appcache-manifest>the manifest</a>, <a href=#concept-appcache-explicit title=concept-appcache-explicit>an explicit entry</a>, <a href=#concept-appcache-fallback title=concept-appcache-fallback>a fallback entry</a>, or a
+   <a href=#concept-appcache-dynamic title=concept-appcache-dynamic>dynamic entry</a> in the
+   <a href=#application-cache>application cache</a>, then get the resource from the
+   cache (instead of fetching it), and abort these steps.</li>
 
    <li>
 
     <p>If the resource's URL has the <a href=#same-origin>same origin</a> as the
-    manifest's URL, and there is an <a href=#concept-appcache-oppcache-ns title=concept-appcache-oppcache-ns>opportunistic caching
-    namespace</a> in the <a href=#application-cache>application cache</a> whose
-    &lt;path&gt; component is a <a href=#prefix-match>prefix match</a> for the
-    resource's URL's <a href=#url-path title=url-path>&lt;path&gt;</a>
-    component, then:
+    manifest's URL, and there is a <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback namespace</a> in
+    the <a href=#application-cache>application cache</a> whose &lt;path&gt; component is
+    a <a href=#prefix-match>prefix match</a> for the resource's URL's <a href=#url-path title=url-path>&lt;path&gt;</a> component, then:</p>
 
     <p><a href=#fetch>Fetch</a> the resource normally. If this results 4xx
     or 5xx status codes or equivalent, or if there were network errors
     (but not if the user canceled the download), then instead get,
     from the cache, the resource of the <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entry</a>
-    corresponding to the namespace with the longest matching
-    &lt;path&gt; component. Abort these steps.</p>
+    corresponding to the namespace with the longest matching <a href=#url-path title=url-path>&lt;path&gt;</a> component. Abort these
+    steps.</p>
 
    </li>
 
+   <li><p>If there is an entry in the <a href=#application-cache>application cache</a>'s
+   <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
+   whitelist</a> that has the <a href=#same-origin>same origin</a> as the
+   resource's URL and that is a <a href=#prefix-match>prefix match</a> for the
+   resource's URL, then <a href=#fetch>fetch</a> the resource normally and
+   abort these steps.</li>
+
    <li><p>Fail the resource load.</li>
 
   </ol><p class=note>The above algorithm ensures that resources that are
@@ -28919,54 +28887,35 @@
 
     <p>If the resource was not fetched from an <a href=#application-cache>application
     cache</a>, and was to be fetched using HTTP GET or equivalent,
-    and its URL <a href=#concept-appcache-matches-oppcache title=concept-appcache-matches-oppcache>matches the
-    opportunistic caching namespace</a> of one or more application
-    caches, and the user didn't cancel the navigation attempt during
-    the previous step, then:</p>
-
-    <dl class=switch><dt>If the browsing context being navigated is a <a href=#top-level-browsing-context>top-level
-     browsing context</a>, and the navigation attempt failed
-     (e.g. the server returned a 4xx or 5xx status code or equivalent,
-     or there was a DNS error)</dt>
-
-     <dd>
-
-      <p>Let <var title="">candidate</var> be the <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback resource</a>
-      specified for the opportunistic caching namespace in
-      question. If multiple application caches match, the user agent
-      must use the fallback of the <a href=#concept-appcache-selection title=concept-appcache-selection>most appropriate application
-      cache</a> of those that match.</p>
-
-      <p>If <var title="">candidate</var> is not marked as <a href=#concept-appcache-foreign title=concept-appcache-foreign>foreign</a>, then the user
-      agent must discard the failed load and instead continue along
-      these steps using <var title="">candidate</var> as the
-      resource.</p>
-
-      <p>For the purposes of session history (and features that depend
-      on session history, e.g. bookmarking) the user agent must use
-      the URL of the resource that was requested (the one that matched
-      the opportunistic caching namespace), not the fallback
-      resource. However, the user agent may indicate to the user that
-      the original page load failed, that the page used was a fallback
-      resource, and what the URL of the fallback resource actually
-      is.</p>
-
-     </dd>
-
-     <dt>Otherwise</dt>
+    and its URL <a href=#concept-appcache-matches-fallback title=concept-appcache-matches-fallback>matches the fallback
+    namespace</a> of one or more application caches, and the user
+    didn't cancel the navigation attempt during the previous step, and
+    the browsing context being navigated is a <a href=#top-level-browsing-context>top-level browsing
+    context</a>, and the navigation attempt failed (e.g. the server
+    returned a 4xx or 5xx status code or equivalent, or there was a
+    DNS error), then:</p>
 
-     <dd>
+    <p>Let <var title="">candidate</var> be the <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback resource</a>
+    specified for the <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback namespace</a> in
+    question. If multiple application caches match, the user agent
+    must use the fallback of the <a href=#concept-appcache-selection title=concept-appcache-selection>most appropriate application
+    cache</a> of those that match.</p>
 
-      <p>Once the download is complete, if there were no errors and
-      the user didn't cancel the request, the user agent must cache
-      the resource in all the application caches that have a <a href=#concept-appcache-matches-oppcache title=concept-appcache-matches-oppcache>matching opportunistic
-      caching namespace</a>, categorized as <a href=#concept-appcache-oppcache title=concept-appcache-oppcache>opportunistically cached
-      entries</a>. Meanwhile, the user agent must continue along
-      these steps.</p>
+    <p>If <var title="">candidate</var> is not marked as <a href=#concept-appcache-foreign title=concept-appcache-foreign>foreign</a>, then the user
+    agent must discard the failed load and instead continue along
+    these steps using <var title="">candidate</var> as the
+    resource.</p>
 
-     </dd>
+    <p>For the purposes of session history (and features that depend
+    on session history, e.g. bookmarking) the user agent must use the
+    URL of the resource that was requested (the one that matched the
+    <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback
+    namespace</a>), not the fallback resource. However, the user
+    agent may indicate to the user that the original page load failed,
+    that the page used was a fallback resource, and what the URL of
+    the fallback resource actually is.</p>
 
-    </dl></li>
+   </li>
 
    <li><p>If the document's out-of-band metadata (e.g. HTTP headers),
    not counting any <a href=#content-type-0 title=Content-Type>type information</a>
@@ -32865,8 +32814,8 @@
   must <a href=#resolve-a-url title="resolve a url">resolve</a> the <a href=#url>URL</a>
   specified in <var title="">src</var>, and if that succeeds, remove
   the resulting <a href=#absolute-url>absolute URL</a> from the <a href=#concept-eventsource-list title=concept-eventsource-list>list of event sources</a> for
-  that object.  If the same URI has been registered multiple times,
-  removing it must remove only one instance of that URI for each
+  that object.  If the same URL has been registered multiple times,
+  removing it must remove only one instance of that URL for each
   invocation of the <code title=removeEventSource>removeEventSource()</code> method. If the
   URL fails to resolve, the user agent does nothing.<h4 id=connecting-to-an-event-stream><span class=secno>7.2.2 </span>Connecting to an event stream</h4><p>Each object implementing the <code>EventTarget</code> and
   <code><a href=#remoteeventtarget>RemoteEventTarget</a></code> interfaces has a <dfn id=concept-eventsource-list title=concept-eventsource-list>list of event sources</dfn> that

Received on Thursday, 16 October 2008 00:37:45 UTC