[html5] r4149 - [giow] (2) Prevent <object> from sniffing text/plain as text/html if there's a t [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2009-10-16 02:05:27 -0700 (Fri, 16 Oct 2009)
New Revision: 4149

Modified:
   complete.html
   index
   source
Log:
[giow] (2) Prevent <object> from sniffing text/plain as text/html if there's a text/html plugin (not that that should ever happen, but...).

Modified: complete.html
===================================================================
--- complete.html	2009-10-16 07:53:34 UTC (rev 4148)
+++ complete.html	2009-10-16 09:05:27 UTC (rev 4149)
@@ -20925,6 +20925,12 @@
 
        <li>
 
+        <p>Let the <var title="">sniffed</var> flag be false.</p>
+
+       </li>
+
+       <li>
+
         <p>If there is a <code title=attr-object-type><a href=#attr-object-type>type</a></code>
         attribute present on the <code><a href=#the-object-element>object</a></code> element, and that
         attribute's value is not a type that the user agent supports,
@@ -20947,7 +20953,8 @@
         being "<code title="">text/plain</code>", then let the <var title="">resource type</var> be the result of applying the
         <a href=#content-type-sniffing:-text-or-binary title="Content-Type sniffing: text or binary">rules for
         distingushing if a resource is text or binary</a> to the
-        resource instead.</p>
+        resource instead, and then set the <var title="">sniffed</var>
+        flag to true.</p>
 
        </li>
 
@@ -20989,10 +20996,15 @@
        <li>
 
         <p>If the <var title="">resource type</var> is still unknown,
-        then change the <var title="">resource type</var> to instead
-        be the <a href=#content-type-sniffing-0 title="content-type sniffing">sniffed type
-        of the resource</a>.</p>
+        and the <var title="">sniffed</var> flag is false, then change
+        the <var title="">resource type</var> to instead be the <a href=#content-type-sniffing-0 title="content-type sniffing">sniffed type of the
+        resource</a>.</p>
 
+        <p>Otherwise, if the <var title="">resource type</var> is
+        still unknown, and the <var title="">sniffed</var> flag is
+        <em>true</em>, then change the <var title="">resource
+        type</var> back to <code title="">text/plain</code>.</p>
+
        </li>
 
       </ol></li>

Modified: index
===================================================================
--- index	2009-10-16 07:53:34 UTC (rev 4148)
+++ index	2009-10-16 09:05:27 UTC (rev 4149)
@@ -20754,6 +20754,12 @@
 
        <li>
 
+        <p>Let the <var title="">sniffed</var> flag be false.</p>
+
+       </li>
+
+       <li>
+
         <p>If there is a <code title=attr-object-type><a href=#attr-object-type>type</a></code>
         attribute present on the <code><a href=#the-object-element>object</a></code> element, and that
         attribute's value is not a type that the user agent supports,
@@ -20776,7 +20782,8 @@
         being "<code title="">text/plain</code>", then let the <var title="">resource type</var> be the result of applying the
         <a href=#content-type-sniffing:-text-or-binary title="Content-Type sniffing: text or binary">rules for
         distingushing if a resource is text or binary</a> to the
-        resource instead.</p>
+        resource instead, and then set the <var title="">sniffed</var>
+        flag to true.</p>
 
        </li>
 
@@ -20818,10 +20825,15 @@
        <li>
 
         <p>If the <var title="">resource type</var> is still unknown,
-        then change the <var title="">resource type</var> to instead
-        be the <a href=#content-type-sniffing-0 title="content-type sniffing">sniffed type
-        of the resource</a>.</p>
+        and the <var title="">sniffed</var> flag is false, then change
+        the <var title="">resource type</var> to instead be the <a href=#content-type-sniffing-0 title="content-type sniffing">sniffed type of the
+        resource</a>.</p>
 
+        <p>Otherwise, if the <var title="">resource type</var> is
+        still unknown, and the <var title="">sniffed</var> flag is
+        <em>true</em>, then change the <var title="">resource
+        type</var> back to <code title="">text/plain</code>.</p>
+
        </li>
 
       </ol></li>

Modified: source
===================================================================
--- source	2009-10-16 07:53:34 UTC (rev 4148)
+++ source	2009-10-16 09:05:27 UTC (rev 4149)
@@ -22265,6 +22265,12 @@
 
        <li>
 
+        <p>Let the <var title="">sniffed</var> flag be false.</p>
+
+       </li>
+
+       <li>
+
         <p>If there is a <code title="attr-object-type">type</code>
         attribute present on the <code>object</code> element, and that
         attribute's value is not a type that the user agent supports,
@@ -22289,7 +22295,8 @@
         title="">resource type</var> be the result of applying the
         <span title="Content-Type sniffing: text or binary">rules for
         distingushing if a resource is text or binary</span> to the
-        resource instead.</p>
+        resource instead, and then set the <var title="">sniffed</var>
+        flag to true.</p>
 
        </li>
 
@@ -22335,10 +22342,16 @@
        <li>
 
         <p>If the <var title="">resource type</var> is still unknown,
-        then change the <var title="">resource type</var> to instead
-        be the <span title="content-type sniffing">sniffed type
-        of the resource</span>.</p>
+        and the <var title="">sniffed</var> flag is false, then change
+        the <var title="">resource type</var> to instead be the <span
+        title="content-type sniffing">sniffed type of the
+        resource</span>.</p>
 
+        <p>Otherwise, if the <var title="">resource type</var> is
+        still unknown, and the <var title="">sniffed</var> flag is
+        <em>true</em>, then change the <var title="">resource
+        type</var> back to <code title="">text/plain</code>.</p>
+
        </li>
 
       </ol>