Changeset 285861 in webkit

Timestamp:

Nov 16, 2021 7:24:18 AM (8 months ago)

Author:

commit-queue@webkit.org

Message:

Empty <input type=file> is represented incorrectly in FormData
​https://bugs.webkit.org/show_bug.cgi?id=185416

Patch by Andreu Botella <​andreu@andreubotella.com> on 2021-11-16
Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

• web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window-expected.txt:

Source/WebCore:

When a FormData object is constructed from a form, an empty <input type="file"> control will
be represented as an empty file with an empty filename. According to the HTML spec, this
file must have "application/octet-stream" as its content type. WebKit has the empty string
instead. This change brings WebKit into alignment with the standard and with Firefox and
Chrome in this area.

Tests: imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.html

• html/FileInputType.cpp:

(WebCore::FileInputType::appendFormData const):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/FileInputType.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-11-16  Andreu Botella  <andreu@andreubotella.com>
+
+        Empty <input type=file> is represented incorrectly in FormData
+        https://bugs.webkit.org/show_bug.cgi?id=185416
+
+        Reviewed by Chris Dumez.
+
+        * web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window-expected.txt:
+
 2021-11-16  Commit Queue  <commit-queue@webkit.org>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window-expected.txt

@@ -1 +1 @@
 
-FAIL Empty <input type=file> is still added to the form's entry list assert_equals: type expected "application/octet-stream" but got ""
+PASS Empty <input type=file> is still added to the form's entry list
 PASS Empty <input type=file> shows up in the urlencoded serialization
 PASS Empty <input type=file> shows up in the multipart/form-data serialization

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-16  Andreu Botella  <andreu@andreubotella.com>
+
+        Empty <input type=file> is represented incorrectly in FormData
+        https://bugs.webkit.org/show_bug.cgi?id=185416
+
+        Reviewed by Chris Dumez.
+
+        When a FormData object is constructed from a form, an empty <input type="file"> control will
+        be represented as an empty file with an empty filename. According to the HTML spec, this
+        file must have "application/octet-stream" as its content type. WebKit has the empty string
+        instead. This change brings WebKit into alignment with the standard and with Firefox and
+        Chrome in this area.
+
+        Tests: imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.html
+
+        * html/FileInputType.cpp:
+        (WebCore::FileInputType::appendFormData const):
+
 2021-11-16  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/html/FileInputType.cpp

@@ -179 +179 @@
     }
 
-    // If no filename at all is entered, return successful but empty.
-    // Null would be more logical, but Netscape posts an empty file. Argh.
+    // If no filename at all is entered, return successful but empty, with
+    // application/octet-stream content type. Null would be more logical, but
+    // Netscape posts an empty file. Argh.
     if (fileList->isEmpty()) {
         auto* document = element() ? &element()->document() : nullptr;
-        formData.append(name, File::create(document, emptyString()));
+        auto file = File::create(
+            document,
+            Blob::create(document, { }, "application/octet-stream"),
+            emptyString());
+        formData.append(name, file);
         return true;
     }