W3C home > Mailing lists > Public > public-html-commits@w3.org > November 2011

html5/spec parsing.html,1.78,1.79 spec.html,1.1772,1.1773

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 02 Nov 2011 20:46:40 +0000
To: public-html-commits@w3.org
Message-Id: <E1RLhho-0006M2-Tw@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv24370

Modified Files:
	parsing.html spec.html 
Log Message:
When a page interpreted as UTF-8 has a <meta charset> saying UTF-16, the spec used to say to reload even though the encoding didn't change. (whatwg r6814)

[updated by splitter]


Index: parsing.html
===================================================================
RCS file: /sources/public/html5/spec/parsing.html,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- parsing.html	27 Oct 2011 20:46:55 -0000	1.78
+++ parsing.html	2 Nov 2011 20:46:26 -0000	1.79
@@ -1173,7 +1173,16 @@
   failed to find an encoding, or if it found an encoding that was not
   the actual encoding of the file.</p>
 
-  <ol><li>If the new encoding is identical or equivalent to the encoding
+  <ol><li>If the encoding that is already being used to interpret the
+   input stream is <a href="infrastructure.html#a-utf-16-encoding">a UTF-16 encoding</a>, then set the <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a> to
+   <i>certain</i> and abort these steps. The new encoding is ignored;
+   if it was anything but the same encoding, then it would be clearly
+   incorrect.</li>
+
+   <li>If the new encoding is <a href="infrastructure.html#a-utf-16-encoding">a UTF-16 encoding</a>, change
+   it to UTF-8.</li>
+
+   <li>If the new encoding is identical or equivalent to the encoding
    that is already being used to interpret the input stream, then set
    the <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a> to
    <i>certain</i> and abort these steps. This happens when the
@@ -1183,15 +1192,6 @@
    pass found that the encoding sniffing algorithm described in the
    earlier section failed to find the right encoding.</li>
 
-   <li>If the encoding that is already being used to interpret the
-   input stream is <a href="infrastructure.html#a-utf-16-encoding">a UTF-16 encoding</a>, then set the <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a> to
-   <i>certain</i> and abort these steps. The new encoding is ignored;
-   if it was anything but the same encoding, then it would be clearly
-   incorrect.</li>
-
-   <li>If the new encoding is <a href="infrastructure.html#a-utf-16-encoding">a UTF-16 encoding</a>, change
-   it to UTF-8.</li>
-
    <li>If all the bytes up to the last byte converted by the current
    decoder have the same Unicode interpretations in both the current
    encoding and the new encoding, and if the user agent supports

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1772
retrieving revision 1.1773
diff -u -d -r1.1772 -r1.1773
--- spec.html	2 Nov 2011 17:46:28 -0000	1.1772
+++ spec.html	2 Nov 2011 20:46:29 -0000	1.1773
@@ -349,7 +349,7 @@
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>,
     <a href="author/">web developer edition</a>.
-This is revision 1.5448.
+This is revision 1.5449.
    </p> 
      <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &#169; 2011 <a href="http://www.w3.org/"><abbr title="World Wide
Received on Wednesday, 2 November 2011 20:48:46 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Wednesday, 2 November 2011 20:48:46 GMT