From 1139bdc6f4ba3b916604c30b77c1d51a8eadd1f2 Mon Sep 17 00:00:00 2001 From: Anne van Kesteren Date: Fri, 27 May 2016 14:54:40 +0200 Subject: [PATCH 1/2] Fix form submission's encoding algorithms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changes the following things: * Makes algorithms other than multipart/form-data return code points rather than bytes, since most callers want code points. With this change we are no longer required to use US-ASCII and more importantly it removes a redundant encode/decode roundtrip. * No longer use multipart/form-data for “Mail as body” since that does not match implementations. They only support the other two encodings there. “Submit as entity body” is the only algorithm that supports multipart/form-data (which makes sense, since a MIME type is required to interpret it). Fixes #663. --- source | 143 ++++++++++++++++++++++++++------------------------------- 1 file changed, 65 insertions(+), 78 deletions(-) diff --git a/source b/source index 50f9071eb94..e2b47103f76 100644 --- a/source +++ b/source @@ -2748,7 +2748,6 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
  • Host equals
  • serialise an integer
  • Default encode set -
  • Percent encode
  • UTF-8 percent encode
  • Percent decode
  • set the username @@ -54448,8 +54447,6 @@ fur to the submitter element's node document. If this fails, abort these steps.

    • -

  • Let action be the resulting URL string.

    • -

  • Let parsed action be the resulting URL record.

  • Let scheme be the scheme of @@ -54575,9 +54572,9 @@ fur

    Mutate action URL
    -

    Let query be the result of running the application/x-www-form-urlencoded encoding algorithm with form - data set and encoding, interpreted as a US-ASCII string.

    +

    Let query be the result of running the + application/x-www-form-urlencoded serializer with form data + set and encoding.

    Set parsed action's query component to query.

    @@ -54588,33 +54585,47 @@ fur
    Submit as entity body
    +

    Switch on enctype: -

    Let entity body be the result of running the appropriate form encoding - algorithm with form data set and encoding.

    +
    +
    application/x-www-form-urlencoded
    -

    Let MIME type be determined as follows:

    +
    +

    Let body be the result of running the + application/x-www-form-urlencoded serializer with form + data set and encoding.

    -
    +

    Set body to the result of encoding + body.

    -
    If enctype is application/x-www-form-urlencoded
    +

    Let MIME type be "application/x-www-form-urlencoded".

    +
    -
    Let MIME type be "application/x-www-form-urlencoded".
    +
    multipart/form-data
    -
    If enctype is multipart/form-data
    +
    +

    Let body be the result of running the multipart/form-data encoding algorithm with form data set + and encoding.

    + +

    Let MIME type be the concatenation of the string "multipart/form-data;", a U+0020 SPACE character, the string "boundary=", and the multipart/form-data + boundary string generated by the multipart/form-data + encoding algorithm.

    +
    -
    Let MIME type be the concatenation of the string "multipart/form-data;", a U+0020 SPACE character, the string "boundary=", and the multipart/form-data boundary - string generated by the multipart/form-data encoding - algorithm.
    +
    text/plain
    -
    If enctype is text/plain
    +
    +

    Let body be the result of running the text/plain + encoding algorithm with form data set, encoding.

    -
    Let MIME type be "text/plain".
    +

    Set body to the result of encoding + body using encoding.

    +

    Let MIME type be "text/plain".

    +

    Plan to navigate to a new request whose @@ -54622,7 +54633,7 @@ fur data-x="concept-request-method">method is method, header list consists of `Content-Type`/MIME type, and body is entity body.

    + data-x="concept-request-body">body is body.

    @@ -54637,9 +54648,9 @@ fur
    Mail with headers
    -

    Let headers be the result of running the application/x-www-form-urlencoded encoding algorithm with form - data set and encoding, interpreted as a US-ASCII string.

    +

    Let headers be the result of running the + application/x-www-form-urlencoded serializer with form data + set and encoding.

    Replace occurrences of U+002B PLUS SIGN characters (+) in headers with the string "%20".

    @@ -54652,11 +54663,27 @@ fur
    Mail as body
    -

    Let body be the resulting of running the appropriate form encoding - algorithm with form data set and encoding, and then percent encoding all the bytes in the resulting byte string - that, when interpreted as US-ASCII, are not characters in the URL default encode - set.

    +

    Switch on enctype: + +

    +
    text/plain
    + +
    +

    Let body be the result of running the text/plain encoding algorithm with form data set and + encoding.

    + +

    Set body to the result of concatonating the result of UTF-8 percent encoding each code point in body, using the + default encode set.

    +
    + +
    Otherwise
    + +

    Let body be the result of running the + application/x-www-form-urlencoded serializer with form data + set and encoding.

    +

    If parsed action's query is null, then set it to the empty string. @@ -54667,8 +54694,8 @@ fur

    Append "body=" to parsed action's query.

    -

    Append body, interpreted as a US-ASCII string, to parsed action's - query.

    +

    Append body to parsed action's query.

    Plan to navigate to parsed action.

    @@ -54702,28 +54729,6 @@ fur -

    The appropriate form encoding algorithm is - determined as follows:

    - -
    - -
    If enctype is application/x-www-form-urlencoded
    - -
    Use the application/x-www-form-urlencoded encoding - algorithm.
    - -
    If enctype is multipart/form-data
    - -
    Use the multipart/form-data encoding algorithm.
    - -
    If enctype is text/plain
    - -
    Use the text/plain encoding algorithm.
    - -
    -
    • @@ -54991,26 +54996,9 @@ fur
    URL-encoded form data
    -

    See the WHATWG URL standard for details on application/x-www-form-urlencoded.

    - -
    - -

    The application/x-www-form-urlencoded encoding algorithm, given a form - data set and encoding, is as follows:

    - -
      - -

    1. Let serialized be the result of running the - application/x-www-form-urlencoded serializer given form data - set and encoding.

      2. - -

    2. Return the result of encoding - serialized.

      3. -
    - -
    +

    See the WHATWG URL standard for + details on application/x-www-form-urlencoded.

    Multipart form data
    @@ -55132,8 +55120,7 @@ fur -

  • Return the result of encoding result using - encoding.

    • +

  • Return result.

    • From b1c849efe03b5668d08e1a13d7689c93f2938039 Mon Sep 17 00:00:00 2001 From: Anne van Kesteren Date: Mon, 30 May 2016 16:09:52 +0200 Subject: [PATCH 2/2] typo --- source | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source b/source index e2b47103f76..e75a845d810 100644 --- a/source +++ b/source @@ -54619,7 +54619,7 @@ fur

    Let body be the result of running the text/plain - encoding algorithm with form data set, encoding.

    + encoding algorithm with form data set and encoding.

    Set body to the result of encoding body using encoding.