[html5] r5546 - [giow] (2) Update to better match UAs. Fixing http://www.w3.org/Bugs/Public/show [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2010-09-28 19:03:21 -0700 (Tue, 28 Sep 2010)
New Revision: 5546

Modified:
   complete.html
   index
   source
Log:
[giow] (2) Update to better match UAs.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=9628

Modified: complete.html
===================================================================
--- complete.html	2010-09-29 01:04:32 UTC (rev 5545)
+++ complete.html	2010-09-29 02:03:21 UTC (rev 5546)
@@ -6520,16 +6520,20 @@
   Content-Type</dfn>, given a string <var title="">s</var>, is as
   follows. It either returns an encoding or nothing.</p>
 
-  <ol><li><p>Find the first seven characters in <var title="">s</var>
-   that are an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for the word
-   "<code title="">charset</code>".  If no such match is found, return
-   nothing.</li>
+  <ol><!-- http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html --><li><p>Let <var title="">position</var> be a pointed into <var title="">s</var>, initially pointing at the start of the
+   string.</li>
 
+   <li><p><i>Loop</i>: Find the first seven characters in <var title="">s</var> after <var title="">position</var> that are an
+   <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for the word "<code title="">charset</code>". If no such match is found, return nothing
+   and abort these steps.</li>
+
    <li><p>Skip any U+0009, U+000A, U+000C, U+000D, or U+0020
    characters that immediately follow the word "<code title="">charset</code>" (there might not be any).</li>
 
    <li><p>If the next character is not a U+003D EQUALS SIGN ('='),
-   return nothing and abort these steps.</li>
+   then move <var title="">position</var> to point just before that
+   next character, and jump back to the step labeled
+   <i>loop</i>.</li>
 
    <li><p>Skip any U+0009, U+000A, U+000C, U+000D, or U+0020
    characters that immediately follow the equals sign (there might not

Modified: index
===================================================================
--- index	2010-09-29 01:04:32 UTC (rev 5545)
+++ index	2010-09-29 02:03:21 UTC (rev 5546)
@@ -6497,16 +6497,20 @@
   Content-Type</dfn>, given a string <var title="">s</var>, is as
   follows. It either returns an encoding or nothing.</p>
 
-  <ol><li><p>Find the first seven characters in <var title="">s</var>
-   that are an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for the word
-   "<code title="">charset</code>".  If no such match is found, return
-   nothing.</li>
+  <ol><!-- http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html --><li><p>Let <var title="">position</var> be a pointed into <var title="">s</var>, initially pointing at the start of the
+   string.</li>
 
+   <li><p><i>Loop</i>: Find the first seven characters in <var title="">s</var> after <var title="">position</var> that are an
+   <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for the word "<code title="">charset</code>". If no such match is found, return nothing
+   and abort these steps.</li>
+
    <li><p>Skip any U+0009, U+000A, U+000C, U+000D, or U+0020
    characters that immediately follow the word "<code title="">charset</code>" (there might not be any).</li>
 
    <li><p>If the next character is not a U+003D EQUALS SIGN ('='),
-   return nothing and abort these steps.</li>
+   then move <var title="">position</var> to point just before that
+   next character, and jump back to the step labeled
+   <i>loop</i>.</li>
 
    <li><p>Skip any U+0009, U+000A, U+000C, U+000D, or U+0020
    characters that immediately follow the equals sign (there might not

Modified: source
===================================================================
--- source	2010-09-29 01:04:32 UTC (rev 5545)
+++ source	2010-09-29 02:03:21 UTC (rev 5546)
@@ -6168,19 +6168,26 @@
   Content-Type</dfn>, given a string <var title="">s</var>, is as
   follows. It either returns an encoding or nothing.</p>
 
-  <ol>
+  <ol> <!-- http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html -->
 
-   <li><p>Find the first seven characters in <var title="">s</var>
-   that are an <span>ASCII case-insensitive</span> match for the word
-   "<code title="">charset</code>".  If no such match is found, return
-   nothing.</p></li>
+   <li><p>Let <var title="">position</var> be a pointed into <var
+   title="">s</var>, initially pointing at the start of the
+   string.</p></li>
 
+   <li><p><i>Loop</i>: Find the first seven characters in <var
+   title="">s</var> after <var title="">position</var> that are an
+   <span>ASCII case-insensitive</span> match for the word "<code
+   title="">charset</code>". If no such match is found, return nothing
+   and abort these steps.</p></li>
+
    <li><p>Skip any U+0009, U+000A, U+000C, U+000D, or U+0020
    characters that immediately follow the word "<code
    title="">charset</code>" (there might not be any).</p></li>
 
    <li><p>If the next character is not a U+003D EQUALS SIGN ('='),
-   return nothing and abort these steps.</p></li>
+   then move <var title="">position</var> to point just before that
+   next character, and jump back to the step labeled
+   <i>loop</i>.</p></li>
 
    <li><p>Skip any U+0009, U+000A, U+000C, U+000D, or U+0020
    characters that immediately follow the equals sign (there might not