Browse files

[e] (0) apply wg decision

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=10805

git-svn-id: http://svn.whatwg.org/webapps@5979 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information...
1 parent ea5c291 commit 40c018f658e739696ea2a300fb4fa1cfdaa665d0 @Hixie Hixie committed Apr 8, 2011
Showing with 77 additions and 57 deletions.
  1. +27 −20 complete.html
  2. +27 −20 index
  3. +23 −17 source
View
47 complete.html
@@ -378,7 +378,8 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
<ol>
<li><a href=#concept-http-equivalent><span class=secno>2.7.1 </span>Protocol concepts</a></li>
<li><a href=#encrypted-http-and-related-security-concerns><span class=secno>2.7.2 </span>Encrypted HTTP and related security concerns</a></li>
- <li><a href=#content-type-sniffing><span class=secno>2.7.3 </span>Determining the type of a resource</a></ol></li>
+ <li><a href=#content-type-sniffing><span class=secno>2.7.3 </span>Determining the type of a resource</a></li>
+ <li><a href=#extracting-encodings-from-meta-elements><span class=secno>2.7.4 </span>Extracting encodings from <code>meta</code> elements</a></ol></li>
<li><a href=#common-dom-interfaces><span class=secno>2.8 </span>Common DOM interfaces</a>
<ol>
<li><a href=#reflecting-content-attributes-in-idl-attributes><span class=secno>2.8.1 </span>Reflecting content attributes in IDL attributes</a></li>
@@ -6799,9 +6800,12 @@ <h4 id=content-type-sniffing><span class=secno>2.7.3 </span>Determining the type
occur. For more details, see the Media Type Sniffing
specification. <a href=#refsMIMESNIFF>[MIMESNIFF]</a></p>
- <p>The <dfn id=algorithm-for-extracting-an-encoding-from-a-content-type>algorithm for extracting an encoding from a
- Content-Type</dfn>, given a string <var title="">s</var>, is as
- follows. It either returns an encoding or nothing.</p>
+
+ <h4 id=extracting-encodings-from-meta-elements><span class=secno>2.7.4 </span>Extracting encodings from <code><a href=#meta>meta</a></code> elements</h4>
+
+ <p>The <dfn id=algorithm-for-extracting-an-encoding-from-a-meta-element>algorithm for extracting an encoding from a
+ <code>meta</code> element</dfn>, given a string <var title="">s</var>, is as follows. It either returns an encoding or
+ nothing.</p>
<ol><!-- http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html --><li><p>Let <var title="">position</var> be a pointer into <var title="">s</var>, initially pointing at the start of the
string.</li>
@@ -6843,13 +6847,14 @@ <h4 id=content-type-sniffing><span class=secno>2.7.3 </span>Determining the type
</dl></li>
- </ol><p class=note>This requirement is a <a href=#willful-violation>willful violation</a>
- of the HTTP specification (for example, HTTP doesn't allow the use
- of single quotes and requires supporting a backslash-escape
- mechanism that is not supported by this algorithm<!-- not to mention
- not having any rules for error-handling, which is of course why
- we're having to define it ourselves -->), motivated by the need for
- backwards compatibility with legacy content. <a href=#refsHTTP>[HTTP]</a></p>
+ </ol><p class=note>This algorithm is distinct from those in the HTTP
+ specification (for example, HTTP doesn't allow the use of single
+ quotes and requires supporting a backslash-escape mechanism that is
+ not supported by this algorithm<!-- not to mention not having any
+ rules for error-handling, which is of course why we're having to
+ define it ourselves -->). While the algorithm is used in contexts
+ that, historically, were related to HTTP, the syntax as supported by
+ implementations diverged some time ago. <a href=#refsHTTP>[HTTP]</a></p>
</div>
@@ -79918,11 +79923,13 @@ <h5 id=determining-the-character-encoding><span class=secno>13.2.2.1 </span>Dete
<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="">need pragma</var> to true.</dd>
+ <dd><p>Apply the <a href=#algorithm-for-extracting-an-encoding-from-a-meta-element>algorithm for extracting an encoding
+ from a <code>meta</code> element</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="">need pragma</var> to
+ true.</dd>
<dt>If the attribute's name is "<code title="">charset</code>"</dt>
@@ -83906,10 +83913,10 @@ <h6 id=the-before-head-insertion-mode><span class=secno>13.2.5.4.3 </span>The "<
value is an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for the
string "<code title="">Content-Type</code>", and the element has a
<code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute, and
- applying the <a href=#algorithm-for-extracting-an-encoding-from-a-content-type>algorithm for extracting an encoding from a
- Content-Type</a> to that attribute's value returns a supported
- <a href=#ascii-compatible-character-encoding>ASCII-compatible character encoding</a> or a UTF-16
- encoding, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is currently
+ applying the <a href=#algorithm-for-extracting-an-encoding-from-a-meta-element>algorithm for extracting an encoding from a
+ <code>meta</code> element</a> to that attribute's value returns
+ a supported <a href=#ascii-compatible-character-encoding>ASCII-compatible character encoding</a> or a
+ UTF-16 encoding, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is currently
<i>tentative</i>, then <a href=#change-the-encoding>change the encoding</a> to the
extracted encoding.</p>
View
47 index
@@ -386,7 +386,8 @@
<ol>
<li><a href=#concept-http-equivalent><span class=secno>2.7.1 </span>Protocol concepts</a></li>
<li><a href=#encrypted-http-and-related-security-concerns><span class=secno>2.7.2 </span>Encrypted HTTP and related security concerns</a></li>
- <li><a href=#content-type-sniffing><span class=secno>2.7.3 </span>Determining the type of a resource</a></ol></li>
+ <li><a href=#content-type-sniffing><span class=secno>2.7.3 </span>Determining the type of a resource</a></li>
+ <li><a href=#extracting-encodings-from-meta-elements><span class=secno>2.7.4 </span>Extracting encodings from <code>meta</code> elements</a></ol></li>
<li><a href=#common-dom-interfaces><span class=secno>2.8 </span>Common DOM interfaces</a>
<ol>
<li><a href=#reflecting-content-attributes-in-idl-attributes><span class=secno>2.8.1 </span>Reflecting content attributes in IDL attributes</a></li>
@@ -6780,9 +6781,12 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
occur. For more details, see the Media Type Sniffing
specification. <a href=#refsMIMESNIFF>[MIMESNIFF]</a></p>
- <p>The <dfn id=algorithm-for-extracting-an-encoding-from-a-content-type>algorithm for extracting an encoding from a
- Content-Type</dfn>, given a string <var title="">s</var>, is as
- follows. It either returns an encoding or nothing.</p>
+
+ <h4 id=extracting-encodings-from-meta-elements><span class=secno>2.7.4 </span>Extracting encodings from <code><a href=#meta>meta</a></code> elements</h4>
+
+ <p>The <dfn id=algorithm-for-extracting-an-encoding-from-a-meta-element>algorithm for extracting an encoding from a
+ <code>meta</code> element</dfn>, given a string <var title="">s</var>, is as follows. It either returns an encoding or
+ nothing.</p>
<ol><!-- http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html --><li><p>Let <var title="">position</var> be a pointer into <var title="">s</var>, initially pointing at the start of the
string.</li>
@@ -6824,13 +6828,14 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
</dl></li>
- </ol><p class=note>This requirement is a <a href=#willful-violation>willful violation</a>
- of the HTTP specification (for example, HTTP doesn't allow the use
- of single quotes and requires supporting a backslash-escape
- mechanism that is not supported by this algorithm<!-- not to mention
- not having any rules for error-handling, which is of course why
- we're having to define it ourselves -->), motivated by the need for
- backwards compatibility with legacy content. <a href=#refsHTTP>[HTTP]</a></p>
+ </ol><p class=note>This algorithm is distinct from those in the HTTP
+ specification (for example, HTTP doesn't allow the use of single
+ quotes and requires supporting a backslash-escape mechanism that is
+ not supported by this algorithm<!-- not to mention not having any
+ rules for error-handling, which is of course why we're having to
+ define it ourselves -->). While the algorithm is used in contexts
+ that, historically, were related to HTTP, the syntax as supported by
+ implementations diverged some time ago. <a href=#refsHTTP>[HTTP]</a></p>
</div>
@@ -75858,11 +75863,13 @@ interface <dfn id=messageport>MessagePort</dfn> {
<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="">need pragma</var> to true.</dd>
+ <dd><p>Apply the <a href=#algorithm-for-extracting-an-encoding-from-a-meta-element>algorithm for extracting an encoding
+ from a <code>meta</code> element</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="">need pragma</var> to
+ true.</dd>
<dt>If the attribute's name is "<code title="">charset</code>"</dt>
@@ -79846,10 +79853,10 @@ document.body.appendChild(text);
value is an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for the
string "<code title="">Content-Type</code>", and the element has a
<code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute, and
- applying the <a href=#algorithm-for-extracting-an-encoding-from-a-content-type>algorithm for extracting an encoding from a
- Content-Type</a> to that attribute's value returns a supported
- <a href=#ascii-compatible-character-encoding>ASCII-compatible character encoding</a> or a UTF-16
- encoding, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is currently
+ applying the <a href=#algorithm-for-extracting-an-encoding-from-a-meta-element>algorithm for extracting an encoding from a
+ <code>meta</code> element</a> to that attribute's value returns
+ a supported <a href=#ascii-compatible-character-encoding>ASCII-compatible character encoding</a> or a
+ UTF-16 encoding, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is currently
<i>tentative</i>, then <a href=#change-the-encoding>change the encoding</a> to the
extracted encoding.</p>
View
40 source
@@ -6417,9 +6417,13 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
occur. For more details, see the Media Type Sniffing
specification. <a href="#refsMIMESNIFF">[MIMESNIFF]</a></p>
+
+ <h4>Extracting encodings from <code>meta</code> elements</h4>
+
<p>The <dfn>algorithm for extracting an encoding from a
- Content-Type</dfn>, given a string <var title="">s</var>, is as
- follows. It either returns an encoding or nothing.</p>
+ <code>meta</code> element</dfn>, given a string <var
+ title="">s</var>, is as follows. It either returns an encoding or
+ nothing.</p>
<ol> <!-- http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html -->
@@ -6473,13 +6477,14 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
</ol>
- <p class="note">This requirement is a <span>willful violation</span>
- of the HTTP specification (for example, HTTP doesn't allow the use
- of single quotes and requires supporting a backslash-escape
- mechanism that is not supported by this algorithm<!-- not to mention
- not having any rules for error-handling, which is of course why
- we're having to define it ourselves -->), motivated by the need for
- backwards compatibility with legacy content. <a
+ <p class="note">This algorithm is distinct from those in the HTTP
+ specification (for example, HTTP doesn't allow the use of single
+ quotes and requires supporting a backslash-escape mechanism that is
+ not supported by this algorithm<!-- not to mention not having any
+ rules for error-handling, which is of course why we're having to
+ define it ourselves -->). While the algorithm is used in contexts
+ that, historically, were related to HTTP, the syntax as supported by
+ implementations diverged some time ago. <a
href="#refsHTTP">[HTTP]</a></p>
</div>
@@ -90465,11 +90470,12 @@ interface <span>WindowLocalStorage</span> {
title="">content</code>"</dt>
<dd><p>Apply the <span>algorithm for extracting an encoding
- from a Content-Type</span>, 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="">need pragma</var> to true.</p></dd>
+ from a <code>meta</code> element</span>, 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="">need pragma</var> to
+ true.</p></dd>
<dt>If the attribute's name is "<code
title="">charset</code>"</dt>
@@ -95095,9 +95101,9 @@ document.body.appendChild(text);
string "<code title="">Content-Type</code>", and the element has a
<code title="attr-meta-content">content</code> attribute, and
applying the <span>algorithm for extracting an encoding from a
- Content-Type</span> to that attribute's value returns a supported
- <span>ASCII-compatible character encoding</span> or a UTF-16
- encoding, and the <span
+ <code>meta</code> element</span> to that attribute's value returns
+ a supported <span>ASCII-compatible character encoding</span> or a
+ UTF-16 encoding, and the <span
title="concept-encoding-confidence">confidence</span> is currently
<i>tentative</i>, then <span>change the encoding</span> to the
extracted encoding.</p>

0 comments on commit 40c018f

Please sign in to comment.