[html5] r1530 - /
whatwg at whatwg.org
whatwg at whatwg.org
Mon May 5 23:51:10 PDT 2008
Author: ianh
Date: 2008-05-05 23:51:09 -0700 (Mon, 05 May 2008)
New Revision: 1530
Modified:
index
source
Log:
[] (0) Make type='' take precedence if the server responded application/octet-stream.
Modified: index
===================================================================
--- index 2008-05-06 06:22:16 UTC (rev 1529)
+++ index 2008-05-06 06:51:09 UTC (rev 1530)
@@ -14223,9 +14223,14 @@
found, or if the handler reports an error, jump to the last step in the
overall set of steps (fallback).</p>
<!--
- if it starts with "java:", then use the plugin for application/x-java-vm
- if it is "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", then use the plugin for application/x-shockwave-flash
- if it starts with "clsid:", then use the plugin for application/x-oleobject
+ case insensitive:
+ is "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" -> application/x-shockwave-flash
+ is "clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa" -> audio/x-pn-realaudio-plugin
+ is "clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" -> video/quicktime
+ is "clsid:166b1bca-3f9c-11cf-8075-444553540000" -> application/x-director
+ is "clsid:6bf52a52-394a-11d3-b153-00c04f79faa6" -> application/x-mplayer2
+ starts with "java:" -> application/x-java-vm
+ starts with "clsid:" -> application/x-oleobject
-->
@@ -14265,49 +14270,55 @@
(fallback).
<li>
- <p>Determine the <em>resource type</em>, as follows:</p>
+ <p>Determine the <var title="">resource type</var>, as follows:</p>
- <dl class=switch>
- <dt>If the resource has <a href="#content-type8"
- title=Content-Type>associated Content-Type metadata</a>
+ <ol>
+ <li>
+ <p>Let the <var title="">resource type</var> be unknown.</p>
- <dd>The type is the type specified in <a href="#content-type8"
- title=Content-Type>the resource's Content-Type metadata</a>.
+ <li>
+ <p>If the resource has <a href="#content-type8"
+ title=Content-Type>associated Content-Type metadata</a>, then let
+ the <var title="">resource type</var> be the type specified in <a
+ href="#content-type8" title=Content-Type>the resource's Content-Type
+ metadata</a>.</p>
- <dt>Otherwise, if the <code title=attr-object-type><a
- href="#type6">type</a></code> attribute is present
+ <li>
+ <p>If the <var title="">resource type</var> is unknown or "<code
+ title="">application/octet-stream</code>" and there is a <code
+ title=attr-object-type><a href="#type6">type</a></code> attribute
+ present on the <code><a href="#object">object</a></code> element,
+ then change the <var title="">resource type</var> to instead be the
+ type specified in that <code title=attr-object-type><a
+ href="#type6">type</a></code> attribute.</p>
- <dd>The type is the type specified in the <code
- title=attr-object-type><a href="#type6">type</a></code> attribute.
+ <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="#sniffed" title="content-type sniffing">sniffed type of the
+ resource</a>.</p>
+ </ol>
- <dt>Otherwise, there is no explicit type information
-
- <dd>The type is the <span title="sniffed type of a resource">sniffed
- type of the resource</span>.
- </dl>
-
<li>
<p>Handle the content as given by the first of the following cases that
matches:</p>
<dl class=switch>
- <dt>If the resource requires a special handler (e.g. a plugin)
+ <dt>If the <var title="">resource type</var> can be handled by a
+ special handler (e.g. a plugin)
<dd>
- <p>If the user agent has an appropriate handler for the specified
- resource, based on the <em>resource type</em> found in the previous
- step, then the user agent <a href="#object-plugin">should use that
+ <p>The user agent <a href="#object-plugin">should use that
handler</a> and pass the content of the resource to that handler. If
- no appropriate handler can be found, or if the handler reports an
- error, then jump to the last step in the overall set of steps
- (fallback).</p>
+ the handler reports an error, then jump to the last step in the
+ overall set of steps (fallback).</p>
- <dt>If the type of the resource is an <span>XML MIME
+ <dt>If the <var title="">resource type</var> is an <span>XML MIME
type</span><!-- XXX xref -->
- <dt>If the type of the resource is HTML
+ <dt>If the <var title="">resource type</var> is HTML
- <dt>If the type of the resource does not start with
+ <dt>If the <var title="">resource type</var> does not start with
"<code>image/</code>"
<dd>
@@ -14330,13 +14341,11 @@
<p class=big-issue>navigation might end up treating it as something
else, because it can do sniffing. how should we handle that?</p>
+ <!-- note that malformed XML files don't cause fallback -->
- <p class=big-issue>What if it's an XML resource and the file is
- malformed? Shouldn't we fail to fallback content?</p>
+ <dt>If the <var title="">resource type</var> starts with
+ "<code>image/</code>", and support for images has not been disabled
- <dt>If the type of the resource starts with "<code>image/</code>", and
- support for images has not been disabled
-
<dd>
<p>Apply the <a href="#content-type6" title="content-type sniffing:
image">image sniffing</a> rules to determine the type of the image.</p>
@@ -14352,7 +14361,8 @@
<dt>Otherwise
<dd>
- <p>Jump to the last step in the overall set of steps (fallback).</p>
+ <p>The given <var title="">resource type</var> is not supported. Jump
+ to the last step in the overall set of steps (fallback).</p>
</dl>
<li>
Modified: source
===================================================================
--- source 2008-05-06 06:22:16 UTC (rev 1529)
+++ source 2008-05-06 06:51:09 UTC (rev 1530)
@@ -12222,9 +12222,14 @@
set of steps (fallback).</p>
<!--
- if it starts with "java:", then use the plugin for application/x-java-vm
- if it is "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", then use the plugin for application/x-shockwave-flash
- if it starts with "clsid:", then use the plugin for application/x-oleobject
+ case insensitive:
+ is "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" -> application/x-shockwave-flash
+ is "clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa" -> audio/x-pn-realaudio-plugin
+ is "clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" -> video/quicktime
+ is "clsid:166b1bca-3f9c-11cf-8075-444553540000" -> application/x-director
+ is "clsid:6bf52a52-394a-11d3-b153-00c04f79faa6" -> application/x-mplayer2
+ starts with "java:" -> application/x-java-vm
+ starts with "clsid:" -> application/x-oleobject
-->
</li>
@@ -12265,32 +12270,49 @@
at the element, then jump to the last step in the overall set of
steps (fallback).</p></li>
- <li><p>Determine the <em>resource type</em>, as follows:</p>
+ <li><p>Determine the <var title="">resource type</var>, as follows:</p>
- <dl class="switch">
+ <ol>
- <dt>If the resource has <span title="Content-Type">associated
- Content-Type metadata</span></dt>
+ <li>
- <dd>The type is the type specified in <span
- title="Content-Type">the resource's Content-Type
- metadata</span>.</dd>
+ <p>Let the <var title="">resource type</var> be unknown.</p>
+ </li>
- <dt>Otherwise, if the <code
- title="attr-object-type">type</code> attribute is present</dt>
+ <li>
- <dd>The type is the type specified in the <code
- title="attr-object-type">type</code> attribute.</dd>
+ <p>If the resource has <span title="Content-Type">associated
+ Content-Type metadata</span>, then let the <var
+ title="">resource type</var> be the type specified in <span
+ title="Content-Type">the resource's Content-Type
+ metadata</span>.</p>
+ </li>
- <dt>Otherwise, there is no explicit type information</dt>
+ <li>
- <dd>The type is the <span title="sniffed type of a
- resource">sniffed type of the resource</span>.</dd>
+ <p>If the <var title="">resource type</var> is unknown or
+ "<code title="">application/octet-stream</code>" and there is
+ a <code title="attr-object-type">type</code> attribute present
+ on the <code>object</code> element, then change the <var
+ title="">resource type</var> to instead be the type specified
+ in that <code title="attr-object-type">type</code>
+ attribute.</p>
- </dl>
+ </li>
+ <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>
+
+ </li>
+
+ </ol>
+
</li>
<li><p>Handle the content as given by the first of the following
@@ -12298,26 +12320,23 @@
<dl class="switch">
- <dt>If the resource requires a special handler (e.g. a plugin)</dt>
+ <dt>If the <var title="">resource type</var> can be handled by
+ a special handler (e.g. a plugin)</dt>
<dd>
- <p>If the user agent has an appropriate handler for the
- specified resource, based on the <em>resource type</em> found
- in the previous step, then the user agent <a
- href="#object-plugin">should use that handler</a> and pass the
- content of the resource to that handler. If no appropriate
- handler can be found, or if the handler reports an error, then
- jump to the last step in the overall set of steps
- (fallback).</p>
+ <p>The user agent <a href="#object-plugin">should use that
+ handler</a> and pass the content of the resource to that
+ handler. If the handler reports an error, then jump to the
+ last step in the overall set of steps (fallback).</p>
</dd>
- <dt>If the type of the resource is an <span>XML MIME
+ <dt>If the <var title="">resource type</var> is an <span>XML MIME
type</span><!-- XXX xref --></dt>
- <dt>If the type of the resource is HTML</dt>
- <dt>If the type of the resource does not start with
+ <dt>If the <var title="">resource type</var> is HTML</dt>
+ <dt>If the <var title="">resource type</var> does not start with
"<code>image/</code>"</dt>
<dd>
@@ -12341,13 +12360,12 @@
something else, because it can do sniffing. how should we
handle that?</p>
- <p class="big-issue">What if it's an XML resource and the file
- is malformed? Shouldn't we fail to fallback content?</p>
+ <!-- note that malformed XML files don't cause fallback -->
</dd>
- <dt>If the type of the resource starts with
+ <dt>If the <var title="">resource type</var> starts with
"<code>image/</code>", and support for images has not been
disabled</dt>
@@ -12371,7 +12389,8 @@
<dd>
- <p>Jump to the last step in the overall set of steps
+ <p>The given <var title="">resource type</var> is not
+ supported. Jump to the last step in the overall set of steps
(fallback).</p>
</dd>
More information about the Commit-Watchers
mailing list