[html5] r1226 - /

[whatwg at whatwg.org]

Author: ianh
Date: 2008-02-14 13:38:35 -0800 (Thu, 14 Feb 2008)
New Revision: 1226

Modified:
   index
   source
Log:
[cgiowt] (2) Make the content-type sniffing for browsing context navigation optional when the Content-Type metadata is present.

Modified: index
===================================================================
--- index	2008-02-14 18:33:19 UTC (rev 1225)
+++ index	2008-02-14 21:38:35 UTC (rev 1226)
@@ -29461,6 +29461,18 @@
 
   <ol>
    <li>
+    <p>Let <var title="">official type</var> be the type given by the <a
+     href="#content-type8" title=Content-Type>Content-Type metadata</a> for
+     the resource (in lowercase<!-- XXX ASCII case folding -->, ignoring any
+     parameters). If there is no such type, jump to the <em
+     title="content-type sniffing: unknown type"><a
+     href="#content-type5">unknown type</a></em> step below.
+
+   <li>
+    <p>If the user agent is configured to strictly obey Content-Type headers
+     for this resource, then jump to the last step in this set of steps.
+
+   <li>
     <p>If the resource was fetched over an HTTP protocol, and there is no
      HTTP Content-Encoding header, but there is an HTTP Content-Type header
      and it has a value whose bytes exactly match one of the following three
@@ -29499,14 +29511,6 @@
      binary"><a href="#content-type4">text or binary</a></em> section below.</p>
 
    <li>
-    <p>Let <var title="">official type</var> be the type given by the <a
-     href="#content-type8" title=Content-Type>Content-Type metadata</a> for
-     the resource (in lowercase<!-- XXX ASCII case folding -->, ignoring any
-     parameters). If there is no such type, jump to the <em
-     title="content-type sniffing: unknown type"><a
-     href="#content-type5">unknown type</a></em> step below.
-
-   <li>
     <p>If <var title="">official type</var> is "unknown/unknown" or
      "application/unknown", jump to the <em title="content-type sniffing:
      unknown type"><a href="#content-type5">unknown type</a></em> step below.</p>
@@ -29538,8 +29542,7 @@
      href="#content-type7">feed or HTML</a></em> section below.
 
    <li>
-    <p>Otherwise, the sniffed type of the resource is <var title="">official
-     type</var>.
+    <p>The sniffed type of the resource is <var title="">official type</var>.
   </ol>
 
   <h4 id=content-type0><span class=secno>4.9.1 </span><dfn

Modified: source
===================================================================
--- source	2008-02-14 18:33:19 UTC (rev 1225)
+++ source	2008-02-14 21:38:35 UTC (rev 1226)
@@ -27016,6 +27016,17 @@
 
   <ol>
 
+   <li><p>Let <var title="">official type</var> be the type given by
+   the <span title="Content-Type">Content-Type metadata</span> for the
+   resource (in lowercase<!-- XXX ASCII case folding -->, ignoring any
+   parameters). If there is no such type, jump to the <em
+   title="content-type sniffing: unknown type">unknown type</em> step
+   below.</p></li>
+
+   <li><p>If the user agent is configured to strictly obey
+   Content-Type headers for this resource, then jump to the last step
+   in this set of steps.</p></li>
+
    <li><p>If the resource was fetched over an HTTP protocol, and there
    is no HTTP Content-Encoding header, but there is an HTTP
    Content-Type header and it has a value whose bytes exactly match
@@ -27043,13 +27054,6 @@
 
    </li>
 
-   <li><p>Let <var title="">official type</var> be the type given by
-   the <span title="Content-Type">Content-Type metadata</span> for the
-   resource (in lowercase<!-- XXX ASCII case folding -->, ignoring any
-   parameters). If there is no such type, jump to the <em
-   title="content-type sniffing: unknown type">unknown type</em> step
-   below.</p></li>
-
    <li><p>If <var title="">official type</var> is "unknown/unknown" or
    "application/unknown", jump to the <em title="content-type
    sniffing: unknown type">unknown type</em> step below.</p></p>
@@ -27074,8 +27078,8 @@
    jump to the <em title="content-type sniffing: feed or html">feed or
    HTML</em> section below.</p></li>
 
-   <li><p>Otherwise, the sniffed type of the resource is <var
-   title="">official type</var>.</p></li>
+   <li><p>The sniffed type of the resource is <var title="">official
+   type</var>.</p></li>
 
   </ol>