[acgiow] (0) Put method=DELETE and method=PUT to rest.

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=10671 git-svn-id: http://svn.whatwg.org/webapps@5566 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Sep 30, 2010 · 6b90264 · 6b90264
1 parent e15fa22
commit 6b90264
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 275 deletions.
diff --git a/complete.html b/complete.html
@@ -45905,19 +45905,11 @@ <h5 id=form-submission-0><span class=secno>4.10.19.6 </span>Form submission</h5>
    to the state <dfn id=attr-fs-method-post title=attr-fs-method-POST>POST</dfn>, indicating
    the HTTP POST method.</li>
 
-   <li>The keyword <dfn id=attr-fs-method-put-keyword title=attr-fs-method-PUT-keyword><code>put</code></dfn>, mapping
-   to the state <dfn id=attr-fs-method-put title=attr-fs-method-PUT>PUT</dfn>, indicating
-   the HTTP PUT method.</li>
-
-   <li>The keyword <dfn id=attr-fs-method-delete-keyword title=attr-fs-method-DELETE-keyword><code>delete</code></dfn>, mapping
-   to the state <dfn id=attr-fs-method-delete title=attr-fs-method-DELETE>DELETE</dfn>, indicating
-   the HTTP DELETE method.</li>
-
   </ul><p>The <i>missing value default</i> for these attributes is the
   <a href=#attr-fs-method-get title=attr-fs-method-GET>GET</a> state.</p>
 
   <p>The <dfn id=concept-fs-method title=concept-fs-method>method</dfn> of an element is
-  one of those four states. If the element is a <a href=#concept-submit-button title=concept-submit-button>submit button</a> and has a <code title=attr-fs-formmethod><a href=#attr-fs-formmethod>formmethod</a></code> attribute, then the
+  one of those states. If the element is a <a href=#concept-submit-button title=concept-submit-button>submit button</a> and has a <code title=attr-fs-formmethod><a href=#attr-fs-formmethod>formmethod</a></code> attribute, then the
   element's <a href=#concept-fs-method title=concept-fs-method>method</a> is that
   attribute's state; otherwise, it is the <a href=#form-owner>form owner</a>'s
   <code title=attr-fs-method><a href=#attr-fs-method>method</a></code> attribute's state.</p>
@@ -46750,38 +46742,24 @@ <h5 id=form-submission-algorithm><span class=secno>4.10.21.3 </span>Form submiss
     <table><thead><tr><td>
       <th> <a href=#attr-fs-method-get title=attr-fs-method-GET>GET</a>
       <th> <a href=#attr-fs-method-post title=attr-fs-method-POST>POST</a>
-      <th> <a href=#attr-fs-method-put title=attr-fs-method-PUT>PUT</a>
-      <th> <a href=#attr-fs-method-delete title=attr-fs-method-DELETE>DELETE</a>
      <tbody><tr><th> <code title="">http</code>
       <td> <a href=#submit-mutate-action title=submit-mutate-action>Mutate action</a>
       <td> <a href=#submit-body title=submit-body>Submit as entity body</a>
-      <td> <a href=#submit-body title=submit-body>Submit as entity body</a>
-      <td> <a href=#submit-delete-action title=submit-delete-action>Delete action</a>
      <tr><th> <code title="">https</code>
       <td> <a href=#submit-mutate-action title=submit-mutate-action>Mutate action</a>
       <td> <a href=#submit-body title=submit-body>Submit as entity body</a>
-      <td> <a href=#submit-body title=submit-body>Submit as entity body</a>
-      <td> <a href=#submit-delete-action title=submit-delete-action>Delete action</a>
      <tr><th> <code title="">ftp</code>
       <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
       <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
-      <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
-      <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
      <tr><th> <code title="">javascript</code>
       <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
       <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
-      <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
-      <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
      <tr><th> <code title="">data</code>
       <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
       <td> <a href=#submit-data-post title=submit-data-post>Post to data:</a>
-      <td> <a href=#submit-data-put title=submit-data-put>Put to data:</a>
-      <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
      <tr><th> <code title="">mailto</code>
       <td> <a href=#submit-mailto-headers title=submit-mailto-headers>Mail with headers</a>
       <td> <a href=#submit-mailto-body title=submit-mailto-body>Mail as body</a>
-      <td> <a href=#submit-mailto-headers title=submit-mailto-headers>Mail with headers</a>
-      <td> <a href=#submit-mailto-headers title=submit-mailto-headers>Mail with headers</a>
     </table><p>If <var title="">scheme</var> is not one of those listed in
     this table, then the behavior is not defined by this
     specification. User agents should, in the absence of another
@@ -46856,25 +46834,6 @@ <h5 id=form-submission-algorithm><span class=secno>4.10.21.3 </span>Form submiss
 
      </dd>
 
-     <dt><dfn id=submit-delete-action title=submit-delete-action>Delete action</dfn>
-     <dd>
-
-      <p>Let <var title="">target browsing context</var> be <a href=#the-form-submission-target-browsing-context>the
-      form submission target browsing context</a>.</p>
-
-      <p>If the <a href=#origin>origin</a> of <var title="">action</var> is
-      not the <a href=#same-origin>same origin</a> as that of the
-      <code><a href=#the-form-element>form</a></code> element's <code><a href=#document>Document</a></code>, then abort
-      these steps.</p> <!-- CORS, one day -->
-
-      <p>Otherwise, <a href=#navigate>navigate</a> <var title="">target
-      browsing context</var> to <var title="">action</var> using the
-      DELETE method. If <var title="">target browsing context</var>
-      was newly created for this purpose by the steps above, then it
-      must be navigated with <a href=#replacement-enabled>replacement enabled</a>.</p>
-
-     </dd>
-
      <dt><dfn id=submit-get-action title=submit-get-action>Get action</dfn>
      <dd>
 
@@ -46922,49 +46881,6 @@ <h5 id=form-submission-algorithm><span class=secno>4.10.21.3 </span>Form submiss
 
      </dd>
 
-     <dt><dfn id=submit-data-put title=submit-data-put>Put to data:</dfn>
-     <dd>
-
-      <p>Let <var title="">data</var> be the result of encoding the
-      <var title="">form data set</var> using the <a href=#appropriate-form-encoding-algorithm>appropriate
-      form encoding algorithm</a>.</p>
-
-      <p>Let <var title="">MIME type</var> be determined as
-      follows:</p>
-
-      <dl><dt>If <var title="">enctype</var> is <code title=attr-fs-enctype-urlencoded><a href=#attr-fs-enctype-urlencoded>application/x-www-form-urlencoded</a></code></dt>
-
-       <dd>Let <var title="">MIME type</var> be "<code title="">application/x-www-form-urlencoded</code>".</dd>
-
-       <dt>If <var title="">enctype</var> is <code title=attr-fs-enctype-formdata><a href=#attr-fs-enctype-formdata>multipart/form-data</a></code></dt>
-
-       <dd>Let <var title="">MIME type</var> be "<code title="">multipart/form-data</code>".</dd>
-
-       <dt>If <var title="">enctype</var> is <code title=attr-fs-enctype-text><a href=#attr-fs-enctype-text>text/plain</a></code></dt>
-
-       <dd>Let <var title="">MIME type</var> be "<code title="">text/plain</code>".</dd>
-
-      </dl><p>Let <var title="">destination</var> be the result of
-      concatenating the following:</p>
-
-      <ol class=brief><li>The string "<code title="">data:</code>".</li>
-
-       <li>The value of <var title="">MIME type</var>.</li>
-
-       <li>The string "<code title="">;base64,</code>".</li>
-
-       <li>A base64-encoded representation of <var title="">data</var>. <a href=#refsRFC4648>[RFC4648]</a></li>
-
-      </ol><p>Let <var title="">target browsing context</var> be <a href=#the-form-submission-target-browsing-context>the
-      form submission target browsing context</a>.</p>
-
-      <p><a href=#navigate>Navigate</a> <var title="">target browsing
-      context</var> to <var title="">destination</var>. If <var title="">target browsing context</var> was newly created for
-      this purpose by the steps above, then it must be navigated with
-      <a href=#replacement-enabled>replacement enabled</a>.</p>
-
-     </dd>
-
      <dt><dfn id=submit-mailto-headers title=submit-mailto-headers>Mail with headers</dfn>
      <dd>
 
@@ -91647,7 +91563,7 @@ <h3 class=no-num id=element-content-categories>Element content categories</h3>
      <td> <code title=attr-fs-formmethod><a href=#attr-fs-formmethod>button</a></code>;
           <code title=attr-fs-formmethod><a href=#attr-fs-formmethod>input</a></code>
      <td> HTTP method to use for <a href=#form-submission>form submission</a>
-     <td> "<code title="">GET</code>"; "<code title="">POST</code>"; "<code title="">PUT</code>"; "<code title="">DELETE</code>"
+     <td> "<code title="">GET</code>"; "<code title="">POST</code>"
     <tr><th> <code title="">formnovalidate</code>
      <td> <code title=attr-fs-formnovalidate><a href=#attr-fs-formnovalidate>button</a></code>;
           <code title=attr-fs-formnovalidate><a href=#attr-fs-formnovalidate>input</a></code>
@@ -91808,7 +91724,7 @@ <h3 class=no-num id=element-content-categories>Element content categories</h3>
     <tr><th> <code title="">method</code>
      <td> <code title=attr-fs-method><a href=#attr-fs-method>form</a></code>
      <td> HTTP method to use for <a href=#form-submission>form submission</a>
-     <td> "<code title="">GET</code>"; "<code title="">POST</code>"; "<code title="">PUT</code>"; "<code title="">DELETE</code>"
+     <td> "<code title="">GET</code>"; "<code title="">POST</code>"
     <tr><th> <code title="">min</code>
      <td> <code title=attr-input-min><a href=#attr-input-min>input</a></code>
      <td> Minimum value

diff --git a/index b/index
@@ -45885,19 +45885,11 @@ out of 233&thinsp;257&thinsp;824 bytes available&lt;/meter&gt;&lt;/p&gt;</pre>
    to the state <dfn id=attr-fs-method-post title=attr-fs-method-POST>POST</dfn>, indicating
    the HTTP POST method.</li>
 
-   <li>The keyword <dfn id=attr-fs-method-put-keyword title=attr-fs-method-PUT-keyword><code>put</code></dfn>, mapping
-   to the state <dfn id=attr-fs-method-put title=attr-fs-method-PUT>PUT</dfn>, indicating
-   the HTTP PUT method.</li>
-
-   <li>The keyword <dfn id=attr-fs-method-delete-keyword title=attr-fs-method-DELETE-keyword><code>delete</code></dfn>, mapping
-   to the state <dfn id=attr-fs-method-delete title=attr-fs-method-DELETE>DELETE</dfn>, indicating
-   the HTTP DELETE method.</li>
-
   </ul><p>The <i>missing value default</i> for these attributes is the
   <a href=#attr-fs-method-get title=attr-fs-method-GET>GET</a> state.</p>
 
   <p>The <dfn id=concept-fs-method title=concept-fs-method>method</dfn> of an element is
-  one of those four states. If the element is a <a href=#concept-submit-button title=concept-submit-button>submit button</a> and has a <code title=attr-fs-formmethod><a href=#attr-fs-formmethod>formmethod</a></code> attribute, then the
+  one of those states. If the element is a <a href=#concept-submit-button title=concept-submit-button>submit button</a> and has a <code title=attr-fs-formmethod><a href=#attr-fs-formmethod>formmethod</a></code> attribute, then the
   element's <a href=#concept-fs-method title=concept-fs-method>method</a> is that
   attribute's state; otherwise, it is the <a href=#form-owner>form owner</a>'s
   <code title=attr-fs-method><a href=#attr-fs-method>method</a></code> attribute's state.</p>
@@ -46730,38 +46722,24 @@ fur
     <table><thead><tr><td>
       <th> <a href=#attr-fs-method-get title=attr-fs-method-GET>GET</a>
       <th> <a href=#attr-fs-method-post title=attr-fs-method-POST>POST</a>
-      <th> <a href=#attr-fs-method-put title=attr-fs-method-PUT>PUT</a>
-      <th> <a href=#attr-fs-method-delete title=attr-fs-method-DELETE>DELETE</a>
      <tbody><tr><th> <code title="">http</code>
       <td> <a href=#submit-mutate-action title=submit-mutate-action>Mutate action</a>
       <td> <a href=#submit-body title=submit-body>Submit as entity body</a>
-      <td> <a href=#submit-body title=submit-body>Submit as entity body</a>
-      <td> <a href=#submit-delete-action title=submit-delete-action>Delete action</a>
      <tr><th> <code title="">https</code>
       <td> <a href=#submit-mutate-action title=submit-mutate-action>Mutate action</a>
       <td> <a href=#submit-body title=submit-body>Submit as entity body</a>
-      <td> <a href=#submit-body title=submit-body>Submit as entity body</a>
-      <td> <a href=#submit-delete-action title=submit-delete-action>Delete action</a>
      <tr><th> <code title="">ftp</code>
       <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
       <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
-      <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
-      <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
      <tr><th> <code title="">javascript</code>
       <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
       <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
-      <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
-      <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
      <tr><th> <code title="">data</code>
       <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
       <td> <a href=#submit-data-post title=submit-data-post>Post to data:</a>
-      <td> <a href=#submit-data-put title=submit-data-put>Put to data:</a>
-      <td> <a href=#submit-get-action title=submit-get-action>Get action</a>
      <tr><th> <code title="">mailto</code>
       <td> <a href=#submit-mailto-headers title=submit-mailto-headers>Mail with headers</a>
       <td> <a href=#submit-mailto-body title=submit-mailto-body>Mail as body</a>
-      <td> <a href=#submit-mailto-headers title=submit-mailto-headers>Mail with headers</a>
-      <td> <a href=#submit-mailto-headers title=submit-mailto-headers>Mail with headers</a>
     </table><p>If <var title="">scheme</var> is not one of those listed in
     this table, then the behavior is not defined by this
     specification. User agents should, in the absence of another
@@ -46836,25 +46814,6 @@ fur
 
      </dd>
 
-     <dt><dfn id=submit-delete-action title=submit-delete-action>Delete action</dfn>
-     <dd>
-
-      <p>Let <var title="">target browsing context</var> be <a href=#the-form-submission-target-browsing-context>the
-      form submission target browsing context</a>.</p>
-
-      <p>If the <a href=#origin>origin</a> of <var title="">action</var> is
-      not the <a href=#same-origin>same origin</a> as that of the
-      <code><a href=#the-form-element>form</a></code> element's <code><a href=#document>Document</a></code>, then abort
-      these steps.</p> <!-- CORS, one day -->
-
-      <p>Otherwise, <a href=#navigate>navigate</a> <var title="">target
-      browsing context</var> to <var title="">action</var> using the
-      DELETE method. If <var title="">target browsing context</var>
-      was newly created for this purpose by the steps above, then it
-      must be navigated with <a href=#replacement-enabled>replacement enabled</a>.</p>
-
-     </dd>
-
      <dt><dfn id=submit-get-action title=submit-get-action>Get action</dfn>
      <dd>
 
@@ -46902,49 +46861,6 @@ fur
 
      </dd>
 
-     <dt><dfn id=submit-data-put title=submit-data-put>Put to data:</dfn>
-     <dd>
-
-      <p>Let <var title="">data</var> be the result of encoding the
-      <var title="">form data set</var> using the <a href=#appropriate-form-encoding-algorithm>appropriate
-      form encoding algorithm</a>.</p>
-
-      <p>Let <var title="">MIME type</var> be determined as
-      follows:</p>
-
-      <dl><dt>If <var title="">enctype</var> is <code title=attr-fs-enctype-urlencoded><a href=#attr-fs-enctype-urlencoded>application/x-www-form-urlencoded</a></code></dt>
-
-       <dd>Let <var title="">MIME type</var> be "<code title="">application/x-www-form-urlencoded</code>".</dd>
-
-       <dt>If <var title="">enctype</var> is <code title=attr-fs-enctype-formdata><a href=#attr-fs-enctype-formdata>multipart/form-data</a></code></dt>
-
-       <dd>Let <var title="">MIME type</var> be "<code title="">multipart/form-data</code>".</dd>
-
-       <dt>If <var title="">enctype</var> is <code title=attr-fs-enctype-text><a href=#attr-fs-enctype-text>text/plain</a></code></dt>
-
-       <dd>Let <var title="">MIME type</var> be "<code title="">text/plain</code>".</dd>
-
-      </dl><p>Let <var title="">destination</var> be the result of
-      concatenating the following:</p>
-
-      <ol class=brief><li>The string "<code title="">data:</code>".</li>
-
-       <li>The value of <var title="">MIME type</var>.</li>
-
-       <li>The string "<code title="">;base64,</code>".</li>
-
-       <li>A base64-encoded representation of <var title="">data</var>. <a href=#refsRFC4648>[RFC4648]</a></li>
-
-      </ol><p>Let <var title="">target browsing context</var> be <a href=#the-form-submission-target-browsing-context>the
-      form submission target browsing context</a>.</p>
-
-      <p><a href=#navigate>Navigate</a> <var title="">target browsing
-      context</var> to <var title="">destination</var>. If <var title="">target browsing context</var> was newly created for
-      this purpose by the steps above, then it must be navigated with
-      <a href=#replacement-enabled>replacement enabled</a>.</p>
-
-     </dd>
-
      <dt><dfn id=submit-mailto-headers title=submit-mailto-headers>Mail with headers</dfn>
      <dd>
 
@@ -87561,7 +87477,7 @@ interface <a href=#htmldocument>HTMLDocument</a> {
      <td> <code title=attr-fs-formmethod><a href=#attr-fs-formmethod>button</a></code>;
           <code title=attr-fs-formmethod><a href=#attr-fs-formmethod>input</a></code>
      <td> HTTP method to use for <a href=#form-submission>form submission</a>
-     <td> "<code title="">GET</code>"; "<code title="">POST</code>"; "<code title="">PUT</code>"; "<code title="">DELETE</code>"
+     <td> "<code title="">GET</code>"; "<code title="">POST</code>"
     <tr><th> <code title="">formnovalidate</code>
      <td> <code title=attr-fs-formnovalidate><a href=#attr-fs-formnovalidate>button</a></code>;
           <code title=attr-fs-formnovalidate><a href=#attr-fs-formnovalidate>input</a></code>
@@ -87722,7 +87638,7 @@ interface <a href=#htmldocument>HTMLDocument</a> {
     <tr><th> <code title="">method</code>
      <td> <code title=attr-fs-method><a href=#attr-fs-method>form</a></code>
      <td> HTTP method to use for <a href=#form-submission>form submission</a>
-     <td> "<code title="">GET</code>"; "<code title="">POST</code>"; "<code title="">PUT</code>"; "<code title="">DELETE</code>"
+     <td> "<code title="">GET</code>"; "<code title="">POST</code>"
     <tr><th> <code title="">min</code>
      <td> <code title=attr-input-min><a href=#attr-input-min>input</a></code>
      <td> Minimum value