- From: Sam Ruby via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 14 Sep 2012 02:13:45 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv17593
Modified Files:
single-page.html spec.html urls.html
Log Message:
commit 4ce3417e1790a2d921add9faf4dae6f47f5f8b85
Author: ianh <ianh@340c8d12-0b0e-0410-8428-c7bf67bfef74>
Date: Fri Aug 10 00:01:59 2012 +0000
[e] (0) factor out these constants
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=17863
Affected topics: HTML
git-svn-id: http://svn.whatwg.org/webapps@7240 340c8d12-0b0e-0410-8428-c7bf67bfef74
(cherry picked from commit e7b5454cfde933740f9eef362744f38bd5610c43)
Index: single-page.html
===================================================================
RCS file: /sources/public/html5/spec/single-page.html,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- single-page.html 14 Sep 2012 01:14:33 -0000 1.114
+++ single-page.html 14 Sep 2012 02:13:42 -0000 1.115
@@ -8210,12 +8210,11 @@
specification. Both sets of rules return a <a href=#mime-type>MIME type</a> as
their result. <a href=#refsMIMESNIFF>[MIMESNIFF]</a></p>
- <p class=warning>It is imperative that the rules in the
- Media Type Sniffing specification be followed
- exactly. When a user agent uses different heuristics for content
- type detection than the server expects, security problems can
- occur. For more details, see the Media Type Sniffing
- specification. <a href=#refsMIMESNIFF>[MIMESNIFF]</a></p>
+ <p class=warning>It is imperative that the rules in the Media Type
+ Sniffing specification be followed exactly. When a user agent uses
+ different heuristics for content type detection than the server
+ expects, security problems can occur. For more details, see the
+ Media Type Sniffing specification. <a href=#refsMIMESNIFF>[MIMESNIFF]</a></p>
<h4 id=extracting-encodings-from-meta-elements><span class=secno>2.7.4 </span>Extracting encodings from <code><a href=#the-meta-element>meta</a></code> elements</h4>
@@ -8231,36 +8230,35 @@
<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.</p></li>
- <li><p>Skip any <a href=#space-character title="space character">space characters</a>
- that immediately follow the word "<code title="">charset</code>" (there might not be any).</p></li>
+ <li><p>Skip any <a href=#space-character title="space character">space
+ characters</a> 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),
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 <a href=#space-character title="space character">space characters</a>
- that immediately follow the equals sign (there might not
- be any).</p></li>
+ <li><p>Skip any <a href=#space-character title="space character">space
+ characters</a> that immediately follow the equals sign (there
+ might not be any).</p></li>
<li>
<p>Process the next character as follows:</p>
- <dl class=switch><dt>If it is a """ (U+0022) and there is a later """ (U+0022) in <var title="">s</var></dt>
- <dt>If it is a "'" (U+0027) and there is a later "'" (U+0027) in <var title="">s</var></dt>
+ <dl class=switch><dt>If it is a """ (U+0022) character and there is a later """ (U+0022) character in <var title="">s</var></dt>
+ <dt>If it is a "'" (U+0027) character and there is a later "'" (U+0027) character in <var title="">s</var></dt>
<dd>Return the encoding corresponding to the string between this character and the next earliest occurrence of this character.</dd>
- <dt>If it is an unmatched """ (U+0022)</dt>
- <dt>If it is an unmatched "'" (U+0027)</dt>
+ <dt>If it is an unmatched """ (U+0022) character</dt>
+ <dt>If it is an unmatched "'" (U+0027) character</dt>
<dt>If there is no next character</dt>
<dd>Return nothing.</dd>
<dt>Otherwise</dt>
<dd>Return the encoding corresponding to the string from this
- character to the first U+0009, U+000A, U+000C, U+000D, U+0020, or
- U+003B character or the end of <var title="">s</var>, whichever
- comes first.</dd>
+ character to the first <a href=#space-character>space character</a> or ";" (U+003B) character, or the end of <var title="">s</var>,
+ whichever comes first.</dd>
</dl></li>
Index: urls.html
===================================================================
RCS file: /sources/public/html5/spec/urls.html,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- urls.html 14 Sep 2012 01:14:41 -0000 1.240
+++ urls.html 14 Sep 2012 02:13:43 -0000 1.241
@@ -1440,12 +1440,11 @@
specification. Both sets of rules return a <a href="infrastructure.html#mime-type">MIME type</a> as
their result. <a href="references.html#refsMIMESNIFF">[MIMESNIFF]</a></p>
- <p class="warning">It is imperative that the rules in the
- Media Type Sniffing specification be followed
- exactly. When a user agent uses different heuristics for content
- type detection than the server expects, security problems can
- occur. For more details, see the Media Type Sniffing
- specification. <a href="references.html#refsMIMESNIFF">[MIMESNIFF]</a></p>
+ <p class="warning">It is imperative that the rules in the Media Type
+ Sniffing specification be followed exactly. When a user agent uses
+ different heuristics for content type detection than the server
+ expects, security problems can occur. For more details, see the
+ Media Type Sniffing specification. <a href="references.html#refsMIMESNIFF">[MIMESNIFF]</a></p>
<h4 id="extracting-encodings-from-meta-elements"><span class="secno">2.7.4 </span>Extracting encodings from <code><a href="the-meta-element.html#the-meta-element">meta</a></code> elements</h4>
@@ -1461,36 +1460,35 @@
<a href="infrastructure.html#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.</p></li>
- <li><p>Skip any <a href="common-microsyntaxes.html#space-character" title="space character">space characters</a>
- that immediately follow the word "<code title="">charset</code>" (there might not be any).</p></li>
+ <li><p>Skip any <a href="common-microsyntaxes.html#space-character" title="space character">space
+ characters</a> 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),
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 <a href="common-microsyntaxes.html#space-character" title="space character">space characters</a>
- that immediately follow the equals sign (there might not
- be any).</p></li>
+ <li><p>Skip any <a href="common-microsyntaxes.html#space-character" title="space character">space
+ characters</a> that immediately follow the equals sign (there
+ might not be any).</p></li>
<li>
<p>Process the next character as follows:</p>
- <dl class="switch"><dt>If it is a """ (U+0022) and there is a later """ (U+0022) in <var title="">s</var></dt>
- <dt>If it is a "'" (U+0027) and there is a later "'" (U+0027) in <var title="">s</var></dt>
+ <dl class="switch"><dt>If it is a """ (U+0022) character and there is a later """ (U+0022) character in <var title="">s</var></dt>
+ <dt>If it is a "'" (U+0027) character and there is a later "'" (U+0027) character in <var title="">s</var></dt>
<dd>Return the encoding corresponding to the string between this character and the next earliest occurrence of this character.</dd>
- <dt>If it is an unmatched """ (U+0022)</dt>
- <dt>If it is an unmatched "'" (U+0027)</dt>
+ <dt>If it is an unmatched """ (U+0022) character</dt>
+ <dt>If it is an unmatched "'" (U+0027) character</dt>
<dt>If there is no next character</dt>
<dd>Return nothing.</dd>
<dt>Otherwise</dt>
<dd>Return the encoding corresponding to the string from this
- character to the first U+0009, U+000A, U+000C, U+000D, U+0020, or
- U+003B character or the end of <var title="">s</var>, whichever
- comes first.</dd>
+ character to the first <a href="common-microsyntaxes.html#space-character">space character</a> or ";" (U+003B) character, or the end of <var title="">s</var>,
+ whichever comes first.</dd>
</dl></li>
Received on Friday, 14 September 2012 02:13:50 UTC