HTML Standard Tracker

Diff (omit for latest revision)
Filter

Short URL: http://html5.org/r/2338

File a bug

SVNBugCommentTime (UTC)
2338[Gecko] [Webkit] [Google Gears] Remove opportunistic caching; leave only the fallback feature.2008-10-16 00:33
Index: source
===================================================================
--- source	(revision 2337)
+++ source	(revision 2338)
@@ -36099,8 +36099,8 @@
      identifier.</p></li>
 
      <li><p>Let <var title="">scheme</var> be the <span
-     title="url-scheme">&lt;scheme&gt;</span> component of the URI,
-     <span>converted to lowercase</span>.</p></li>
+     title="url-scheme">&lt;scheme&gt;</span> component of <var
+     title="">url</var>, <span>converted to lowercase</span>.</p></li>
 
      <li><p>If the UA doesn't support the protocol given by <var
      title="">scheme</var>, then return a new globally unique
@@ -38239,7 +38239,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>
 
@@ -38458,15 +38458,6 @@
      entries.
 
  
-     <dt><dfn title="concept-appcache-oppcache">Opportunistically cached entries</dfn>
-
-     <dd>Resources whose URLs <span
-     title="concept-appcache-matches-oppcache">matched</span> an <span
-     title="concept-appcache-oppcache-ns">opportunistic caching
-     namespace</span> when they were fetched, and were therefore
-     cached in the application cache.
-
- 
      <dt><dfn title="concept-appcache-dynamic">Dynamic entries</dfn>
 
      <dd>Resources that were added to the cache by the <code
@@ -38481,18 +38472,17 @@
 
    </li>
 
-   <li>Zero or more <dfn
-   title="concept-appcache-oppcache-ns">opportunistic caching
+   <li>Zero or more <dfn title="concept-appcache-fallback-ns">fallback
    namespaces</dfn>: URLs, used as <span
-   title="concept-appcache-matches-oppcache">prefix match
+   title="concept-appcache-matches-fallback">prefix match
    patterns</span>, each of which is mapped to a <span
    title="concept-appcache-fallback">fallback entry</span>. Each
-   namespace URL prefix, when parsed as a URL, has the <span>same
-   origin</span> as <span title="concept-appcache-manifest">the
-   manifest</span>.</li>
+   namespace URL has the <span>same origin</span> as <span
+   title="concept-appcache-manifest">the manifest</span>.</li>
 
    <li>Zero or more URLs that form the <dfn
-   title="concept-appcache-onlinewhitelist">online whitelist</dfn>.
+   title="concept-appcache-onlinewhitelist">online whitelist
+   namespaces</dfn>.
 
   </ul>
 
@@ -38659,19 +38649,18 @@
   empty.</p>
 
   <p>URLs that are to be fallback pages associated with <span
-  title="concept-appcache-oppcache-ns">opportunistic caching
-  namespaces</span>, 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>
+  title="concept-appcache-fallback-ns">fallback namespaces</span>, 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>
 
-  <p><span title="concept-appcache-oppcache-ns">Opportunistic caching
+  <p><span title="concept-appcache-fallback-ns">Fallback
   namespaces</span> must have the <span>same origin</span> as the
   manifest itself.</p>
 
-  <p>An opportunistic caching namespace must not be listed more than
-  once.</p>
+  <p>A <span title="concept-appcache-fallback-ns">fallback
+  namespace</span> must not be listed more than once.</p>
 
   <p>URLs that the user agent is to put into the <span
   title="concept-appcache-onlinewhitelist">online whitelist</span>
@@ -38679,11 +38668,6 @@
   for any URL that the page is intending to use to communicate back to
   the server.)</p>
 
-  <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>
-
   <p>Relative URLs must be given relative to the manifest's own
   URL.</p>
 
@@ -38712,8 +38696,8 @@
    entries</span>.</p></li>
 
    <li><p>Let <var title="">fallback URLs</var> be an initially empty
-   mapping of <span title="concept-appcache-oppcache-ns">opportunistic
-   caching namespaces</span> to <span
+   mapping of <span title="concept-appcache-fallback-ns">fallback
+   namespaces</span> to <span
    title="concept-appcache-fallback">fallback entries</span>.</p></li>
 
    <li><p>Let <var title="">online whitelist URLs</var> be an
@@ -38908,17 +38892,16 @@
 
       <p>If the <span>absolute URL</span> corresponding to <var
       title="">part one</var> is already in the <var title="">fallback
-      URIs</var> mapping as an <span
-      title="concept-appcache-oppcache-ns">opportunistic caching
-      namespace</span>, then jump back to the step labeled "start of
-      line".</p>
+      URLs</var> mapping as a <span
+      title="concept-appcache-fallback-ns">fallback namespace</span>,
+      then jump back to the step labeled "start of line".</p>
 
       <p>Otherwise, add the <span>absolute URL</span> corresponding to
       <var title="">part one</var> to the <var title="">fallback
-      URIs</var> mapping as an <span
-      title="concept-appcache-oppcache-ns">opportunistic caching
-      namespace</span>, mapped to the <span>absolute URL</span>
-      corresponding to <var title="">part two</var> as the <span
+      URLs</var> mapping as a <span
+      title="concept-appcache-fallback-ns">fallback namespace</span>,
+      mapped to the <span>absolute URL</span> corresponding to <var
+      title="">part two</var> as the <span
       title="concept-appcache-fallback">fallback entry</span>.</p>
 
      </dd>
@@ -38970,12 +38953,11 @@
 
   </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.</p>
+  <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.</p>
 
 
   <h4>Updating an application cache</h4>
@@ -39060,9 +39042,9 @@
     manifest">rules for parsing manifests</span>, obtaining a list of
     <span title="concept-appcache-explicit">explicit entries</span>,
     <span title="concept-appcache-fallback">fallback entries</span>
-    and the <span title="concept-appcache-oppcache-ns">opportunistic
-    caching namespaces</span> that map to them, and entries for the
-    <span title="concept-appcache-onlinewhitelist">online
+    and the <span title="concept-appcache-fallback-ns">fallback
+    namespaces</span> that map to them, and entries for the <span
+    title="concept-appcache-onlinewhitelist">online
     whitelist</span>.</p>
 
    </li>
@@ -39152,16 +39134,6 @@
 
    <li><p>If this is an <span title="concept-appcache-upgrade">upgrade
    attempt</span>, then add all the URLs of <span
-   title="concept-appcache-oppcache">opportunistically cached
-   entries</span> in <var title="">cache</var> that <span
-   title="concept-appcache-matches-oppcache">match</span> the <span
-   title="concept-appcache-oppcache-ns">opportunistic caching
-   namespaces</span> obtained by parsing <var title="">manifest</var>
-   to <var title="">file list</var>, each flagged with "opportunistic
-   entry".</p></li>
-
-   <li><p>If this is an <span title="concept-appcache-upgrade">upgrade
-   attempt</span>, then add all the URLs of <span
    title="concept-appcache-implicit">implicit entries</span> in <var
    title="">cache</var> to <var title="">file list</var>, each flagged
    with "implicit entry".</p></li>
@@ -39237,12 +39209,6 @@
      entry as a <span title="concept-appcache-fallback">fallback
      entry</span>.</p></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 <span
-     title="concept-appcache-oppcache">opportunistically cached
-     entry</span>.</p></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 <span title="concept-appcache-implicit">implicit
@@ -39263,8 +39229,8 @@
    title="concept-appcache-manifest">the manifest</span>.</p></li>
 
    <li><p>Store the list of <span
-   title="concept-appcache-oppcache-ns">opportunistic caching
-   namespaces</span>, and the URLs of the <span
+   title="concept-appcache-fallback-ns">fallback namespaces</span>,
+   and the URLs of the <span
    title="concept-appcache-fallback">fallback entries</span> that they
    map to, in the new cache.</p></li>
 
@@ -39370,28 +39336,28 @@
   title="navigate">navigation</span> model, but references the
   algorithms defined in this section.</p>
 
-  <p>A URL <dfn title="concept-appcache-matches-oppcache">matches an
-  opportunistic caching namespace</dfn> if there exists an
-  <span>application cache</span> whose <span
+  <p>A URL <dfn title="concept-appcache-matches-fallback">matches a
+  fallback namespace</dfn> if there exists an <span>application
+  cache</span> whose <span
   title="concept-appcache-manifest">manifest</span>'s URL has the
   <span>same origin</span> as the URL in question, and if that
-  application cache has an <span
-  title="concept-appcache-oppcache-ns">opportunistic caching
-  namespace</span> with a <span title="url-path">&lt;path&gt;</span>
-  component that exactly matches the start of the <span
+  application cache has a <span
+  title="concept-appcache-fallback-ns">fallback namespace</span> with
+  a <span title="url-path">&lt;path&gt;</span> component that is a
+  <span>prefix match</span> for the <span
   title="url-path">&lt;path&gt;</span> 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.</p>
+  examined. If multiple fallback namespaces match the same URL, the
+  one with the longest <span title="url-path">&lt;path&gt;</span> 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.</p>
 
   <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
+   <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
@@ -39560,40 +39526,38 @@
    title="concept-appcache-implicit">an implicit entry</span>, <span
    title="concept-appcache-manifest">the manifest</span>, <span
    title="concept-appcache-explicit">an explicit entry</span>, <span
-   title="concept-appcache-fallback">a fallback entry</span>, <span
-   title="concept-appcache-oppcache">an opportunistically cached
-   entry</span>, or a <span title="concept-appcache-dynamic">dynamic
-   entry</span> in the <span>application cache</span>, then get the
-   resource from the cache (instead of fetching it), and abort these
-   steps.</p></li>
+   title="concept-appcache-fallback">a fallback entry</span>, or a
+   <span title="concept-appcache-dynamic">dynamic entry</span> in the
+   <span>application cache</span>, then get the resource from the
+   cache (instead of fetching it), and abort these steps.</p></li>
 
-   <li><p>If there is an entry in the <span>application cache</span>'s
-   <span title="concept-appcache-onlinewhitelist">online
-   whitelist</span> that has the <span>same origin</span> as the
-   resource's URL and that is a <span>prefix match</span> for the
-   resource's URL, then <span>fetch</span> the resource normally and
-   abort these steps.</p></li>
-
    <li>
 
     <p>If the resource's URL has the <span>same origin</span> as the
-    manifest's URL, and there is an <span
-    title="concept-appcache-oppcache-ns">opportunistic caching
-    namespace</span> in the <span>application cache</span> whose
-    &lt;path&gt; component is a <span>prefix match</span> for the
-    resource's URL's <span title="url-path">&lt;path&gt;</span>
-    component, then:
+    manifest's URL, and there is a <span
+    title="concept-appcache-fallback-ns">fallback namespace</span> in
+    the <span>application cache</span> whose &lt;path&gt; component is
+    a <span>prefix match</span> for the resource's URL's <span
+    title="url-path">&lt;path&gt;</span> component, then:</p>
 
     <p><span>Fetch</span> 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 <span
     title="concept-appcache-fallback">fallback entry</span>
-    corresponding to the namespace with the longest matching
-    &lt;path&gt; component. Abort these steps.</p>
+    corresponding to the namespace with the longest matching <span
+    title="url-path">&lt;path&gt;</span> component. Abort these
+    steps.</p>
 
    </li>
 
+   <li><p>If there is an entry in the <span>application cache</span>'s
+   <span title="concept-appcache-onlinewhitelist">online
+   whitelist</span> that has the <span>same origin</span> as the
+   resource's URL and that is a <span>prefix match</span> for the
+   resource's URL, then <span>fetch</span> the resource normally and
+   abort these steps.</p></li>
+
    <li><p>Fail the resource load.</p></li>
 
   </ol>
@@ -40594,62 +40558,38 @@
     <p>If the resource was not fetched from an <span>application
     cache</span>, and was to be fetched using HTTP GET or equivalent,
     and its URL <span
-    title="concept-appcache-matches-oppcache">matches the
-    opportunistic caching namespace</span> of one or more application
-    caches, and the user didn't cancel the navigation attempt during
-    the previous step, then:</p>
+    title="concept-appcache-matches-fallback">matches the fallback
+    namespace</span> 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 <span>top-level browsing
+    context</span>, 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>
 
-    <dl class="switch">
+    <p>Let <var title="">candidate</var> be the <span
+    title="concept-appcache-fallback">fallback resource</span>
+    specified for the <span
+    title="concept-appcache-fallback-ns">fallback namespace</span> in
+    question. If multiple application caches match, the user agent
+    must use the fallback of the <span
+    title="concept-appcache-selection">most appropriate application
+    cache</span> of those that match.</p>
 
-     <dt>If the browsing context being navigated is a <span>top-level
-     browsing context</span>, 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>
+    <p>If <var title="">candidate</var> is not marked as <span
+    title="concept-appcache-foreign">foreign</span>, 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
+    <span title="concept-appcache-fallback-ns">fallback
+    namespace</span>), 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>
 
-      <p>Let <var title="">candidate</var> be the <span
-      title="concept-appcache-fallback">fallback resource</span>
-      specified for the opportunistic caching namespace in
-      question. If multiple application caches match, the user agent
-      must use the fallback of the <span
-      title="concept-appcache-selection">most appropriate application
-      cache</span> of those that match.</p>
-
-      <p>If <var title="">candidate</var> is not marked as <span
-      title="concept-appcache-foreign">foreign</span>, 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>
-
-     <dd>
-
-      <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 <span
-      title="concept-appcache-matches-oppcache">matching opportunistic
-      caching namespace</span>, categorized as <span
-      title="concept-appcache-oppcache">opportunistically cached
-      entries</span>. Meanwhile, the user agent must continue along
-      these steps.</p>
-
-     </dd>
-
-    </dl>
-
    </li>
 
    <li><p>If the document's out-of-band metadata (e.g. HTTP headers),
@@ -46821,8 +46761,8 @@
   specified in <var title="">src</var>, and if that succeeds, remove
   the resulting <span>absolute URL</span> from the <span
   title="concept-eventsource-list">list of event sources</span> 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.</p>

|