W3C home > Mailing lists > Public > public-html-diffs@w3.org > January 2011

hixie: Make the charset sniffer more accurately match the parser. (whatwg r5764)

From: poot <cvsmail@w3.org>
Date: Tue, 11 Jan 2011 21:43:57 -0500
To: public-html-diffs@w3.org
Message-Id: <E1Pcqgn-0000Dz-LG@jay.w3.org>
hixie: Make the charset sniffer more accurately match the parser.
(whatwg r5764)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.4627&r2=1.4628&f=h
http://html5.org/tools/web-apps-tracker?from=5763&to=5764

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4627
retrieving revision 1.4628
diff -u -d -r1.4627 -r1.4628
--- Overview.html	11 Jan 2011 05:57:55 -0000	1.4627
+++ Overview.html	11 Jan 2011 06:03:37 -0000	1.4628
@@ -54342,7 +54342,7 @@
 
          <li><p>Let <var title="">got pragma</var> be false.</li>
 
-         <li><p>Let <var title="">mode</var> be null.</li>
+         <li><p>Let <var title="">need pragma</var> be null.</li>
 
          <li><p>Let <var title="">charset</var> be the null value
          (which, for the purposes of this algorithm, is distinct from
@@ -54355,6 +54355,9 @@
          <li><p>If the attribute's name is already in <var title="">attribute list</var>, then return to the step
          labeled <i>attributes</i>.</p>
 
+         <li><p>Add the attribute's name to <var title="">attribute
+         list</var>.</p>
+
          <li>
 
           <p>Run the appropriate step from the following list, if one
@@ -54365,29 +54368,28 @@
            <dd><p>If the attribute's value is "<code title="">content-type</code>", then set <var title="">got
            pragma</var> to true.</dd>
 
-           <dt>If the attribute's name is "<code title="">charset</code>"</dt>
-
-           <dd><p>If <var title="">charset</var> is still set to null,
-           let <var title="">charset</var> be the encoding
-           corresponding to the attribute's value, and set <var title="">mode</var> to "charset".</dd>
-
            <dt>If the attribute's name is "<code title="">content</code>"</dt>
 
            <dd><p>Apply the <a href="#algorithm-for-extracting-an-encoding-from-a-content-type">algorithm for extracting an encoding
            from a Content-Type</a>, giving the attribute's value as
            the string to parse. If an encoding is returned, and if
            <var title="">charset</var> is still set to null, let <var title="">charset</var> be the encoding returned, and set
-           <var title="">mode</var> to "pragma".</dd>
+           <var title="">need pragma</var> to true.</dd>
+
+           <dt>If the attribute's name is "<code title="">charset</code>"</dt>
+
+           <dd><p>Let <var title="">charset</var> be the encoding
+           corresponding to the attribute's value, and set <var title="">need pragma</var> to false.</dd>
 
           </dl></li>
 
          <li><p>Return to the step labeled <i>attributes</i>.</li>
 
-         <li><p><i>Processing</i>: If <var title="">mode</var> is
-         null, then jump to the second step of the overall "two step"
-         algorithm.</li>
+         <li><p><i>Processing</i>: If <var title="">need pragma</var>
+         is null, then jump to the second step of the overall "two
+         step" algorithm.</li>
 
-         <li><p>If <var title="">mode</var> is "pragma" but <var title="">got pragma</var> is false, then jump to the second
+         <li><p>If <var title="">mode</var> is true but <var title="">got pragma</var> is false, then jump to the second
          step of the overall "two step" algorithm.</li>
 
          <li><p>If <var title="">charset</var> is a UTF-16 encoding,
Received on Wednesday, 12 January 2011 02:44:01 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Wednesday, 12 January 2011 04:20:43 GMT