Skip to content

Commit

Permalink
[giow] (2) Prevent <object> from sniffing text/plain as text/html if …
Browse files Browse the repository at this point in the history 
…there's a text/html plugin (not that that should ever happen, but...).

git-svn-id: http://svn.whatwg.org/webapps@4149 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Oct 16, 2009
1 parent c9673a6 commit 11e8750
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 12 deletions.
20 changes: 16 additions & 4 deletions complete.html
View file
Expand Up @@ -20923,6 +20923,12 @@ <h4 id=the-object-element><span class=secno>4.8.5 </span>The <dfn><code>object</

</li>

<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>
Expand All @@ -20947,7 +20953,8 @@ <h4 id=the-object-element><span class=secno>4.8.5 </span>The <dfn><code>object</
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>

Expand Down Expand Up @@ -20989,9 +20996,14 @@ <h4 id=the-object-element><span class=secno>4.8.5 </span>The <dfn><code>object</
<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>

Expand Down
20 changes: 16 additions & 4 deletions index
View file
Expand Up @@ -20752,6 +20752,12 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>

</li>

<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>
Expand All @@ -20776,7 +20782,8 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
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>

Expand Down Expand Up @@ -20818,9 +20825,14 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>
<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>

Expand Down
21 changes: 17 additions & 4 deletions source
View file
Expand Up @@ -22263,6 +22263,12 @@ href="?audio">audio&lt;/a> test instead.)&lt;/p></pre>

</li>

<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>
Expand All @@ -22289,7 +22295,8 @@ href="?audio">audio&lt;/a> test instead.)&lt;/p></pre>
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>

Expand Down Expand Up @@ -22335,9 +22342,15 @@ href="?audio">audio&lt;/a> test instead.)&lt;/p></pre>
<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>

Expand Down

0 comments on commit 11e8750

Please sign in to comment.