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

html5/spec Overview.html,1.4636,1.4637

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 11 Jan 2011 20:56:59 +0000
To: public-html-commits@w3.org
Message-Id: <E1PclH1-0004JK-Cc@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv16556

Modified Files:
	Overview.html 
Log Message:
Provide a hook for the XHR spec. (whatwg r5774)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4636
retrieving revision 1.4637
diff -u -d -r1.4636 -r1.4637
--- Overview.html	11 Jan 2011 20:40:07 -0000	1.4636
+++ Overview.html	11 Jan 2011 20:56:55 -0000	1.4637
@@ -38640,6 +38640,8 @@
 
   <!-- http://hixie.ch/tests/adhoc/html/forms/submission/multipart_form-data/ -->
 
+  <!-- NOTE: This algorithm is also used by the XHR spec -->
+
   <p>The <dfn id="multipart-form-data-encoding-algorithm"><code title="">multipart/form-data</code> encoding
   algorithm</dfn> is as follows:</p>
 
@@ -38647,7 +38649,13 @@
 
    <li>
 
-    <p>If the <code><a href="#the-form-element">form</a></code> element has an <code title="attr-form-accept-charset"><a href="#attr-form-accept-charset">accept-charset</a></code> attribute,
+    <p>If the algorithm was invoked with an explicit character
+    encoding, let the selected character encoding be that encoding.
+    (This algorithm is used by other specifications, which provide an
+    explicit character encoding to avoid the dependency on the
+    <code><a href="#the-form-element">form</a></code> element described in the next paragraph.)</p>
+
+    <p>Otherwise, if the <code><a href="#the-form-element">form</a></code> element has an <code title="attr-form-accept-charset"><a href="#attr-form-accept-charset">accept-charset</a></code> attribute,
     then, taking into account the characters found in the <var title="">form data set</var>'s names and values, and the character
     encodings supported by the user agent, select a character encoding
     from the list given in the <code><a href="#the-form-element">form</a></code>'s <code title="attr-form-accept-charset"><a href="#attr-form-accept-charset">accept-charset</a></code> attribute
@@ -38671,9 +38679,8 @@
     <p>For each entry in the <var title="">form data set</var>,
     perform these substeps:</p>
 
-    <ol><li><p>If the entry's name is "<code title="attr-fe-name-charset"><a href="#attr-fe-name-charset">_charset_</a></code>"
-     and its type is "<code title="">hidden</code>", replace its value
-     with <var title="">charset</var>.</li>
+    <ol><li><p>If the entry's name is "<code title="attr-fe-name-charset"><a href="#attr-fe-name-charset">_charset_</a></code>" and its type is
+     "<code title="">hidden</code>", replace its value with <var title="">charset</var>.</li>
 
      <!-- the step that replaces a file with its name is missing in
      this version of the algorithm -->
Received on Tuesday, 11 January 2011 20:57:00 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 11 January 2011 20:57:01 GMT