Changeset 213062 in webkit

Timestamp:

Feb 27, 2017 6:48:43 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Downloads attributes tests are failing
​https://bugs.webkit.org/show_bug.cgi?id=168871

Reviewed by Michael Catanzaro.

Source/WebCore:

Use libsoup to get the suggested filename from the Content-Disposition header instead of buggy
filenameFromHTTPContentDisposition().

Fixes: fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-doublequote.html

fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-unicode.html

• platform/network/soup/ResourceResponseSoup.cpp:

(WebCore::ResourceResponse::platformSuggestedFilename):

LayoutTests:

Remove passing tests and add new baseline for
fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-slashes.html because libsoup handles slashes
differently but download succeeds.

• platform/gtk/TestExpectations:
• platform/gtk/fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-slashes-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• LayoutTests/platform/gtk/fast/dom/HTMLAnchorElement (added)
• LayoutTests/platform/gtk/fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-slashes-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-02-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Downloads attributes tests are failing
+        https://bugs.webkit.org/show_bug.cgi?id=168871
+
+        Reviewed by Michael Catanzaro.
+
+        Remove passing tests and add new baseline for
+        fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-slashes.html because libsoup handles slashes
+        differently but download succeeds.
+
+        * platform/gtk/TestExpectations:
+        * platform/gtk/fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-slashes-expected.txt: Added.
+
 2017-02-27  Antoine Quint  <graouts@apple.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -2915 +2915 @@
 webkit.org/b/168719 fast/css/paint-order-shadow.html [ ImageOnlyFailure ]
 
-webkit.org/b/168871 fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-doublequote.html [ Failure ]
-webkit.org/b/168871 fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-slashes.html [ Failure ]
-webkit.org/b/168871 fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-unicode.html [ Timeout ]
-
 #////////////////////////////////////////////////////////////////////////////////////////
 # End of non-crashing, non-flaky tests failing

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Downloads attributes tests are failing
+        https://bugs.webkit.org/show_bug.cgi?id=168871
+
+        Reviewed by Michael Catanzaro.
+
+        Use libsoup to get the suggested filename from the Content-Disposition header instead of buggy
+        filenameFromHTTPContentDisposition().
+
+        Fixes: fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-doublequote.html
+               fast/dom/HTMLAnchorElement/anchor-file-blob-download-includes-unicode.html
+
+        * platform/network/soup/ResourceResponseSoup.cpp:
+        (WebCore::ResourceResponse::platformSuggestedFilename):
+
 2017-02-27  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp

@@ -97 +97 @@
 String ResourceResponse::platformSuggestedFilename() const
 {
+    SoupMessageHeaders* soupHeaders = soup_message_headers_new(SOUP_MESSAGE_HEADERS_RESPONSE);
     String contentDisposition(httpHeaderField(HTTPHeaderName::ContentDisposition));
-    return filenameFromHTTPContentDisposition(String::fromUTF8WithLatin1Fallback(contentDisposition.characters8(), contentDisposition.length()));
+    soup_message_headers_append(soupHeaders, "Content-Disposition", contentDisposition.utf8().data());
+    GRefPtr<GHashTable> params;
+    soup_message_headers_get_content_disposition(soupHeaders, nullptr, &params.outPtr());
+    soup_message_headers_free(soupHeaders);
+    char* filename = params ? static_cast<char*>(g_hash_table_lookup(params.get(), "filename")) : nullptr;
+    return filename ? String::fromUTF8(filename) : String();
 }