<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[280802] releases/WebKitGTK/webkit-2.32</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/280802">280802</a></dd>
<dt>Author</dt> <dd>aperez@igalia.com</dd>
<dt>Date</dt> <dd>2021-08-09 15:54:53 -0700 (Mon, 09 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/280422">r280422</a> - [WPE][GTK] .asc file extension is appended to filename of text/plain downloads
https://bugs.webkit.org/show_bug.cgi?id=228566

Patch by Michael Catanzaro <mcatanzaro@gnome.org> on 2021-07-29
Reviewed by Adrian Perez de Castro.

Source/WebCore:

Our MIMETypeRegistry::preferredExtensionForMIMEType returns "asc" for text/plain, possibly
because "asc" sorts alphabetically ahead of all other possible file extensions for
text/plain, and we just pick the first one. So if the text file does not contain any file
extension, we give it a file extension for a GPG signature. Ouch.

I don't know how to fix it, but we don't need to, because we don't really want to append any
file extension for text/plain anyway. That's just annoying. If I download a file named
"backtrace" then I don't want it renamed to "backtrace.txt". That would be expected on
Windows, but certainly not from WebKitGTK. So I think it's reasonable to have a special case
for text/plain.

* platform/xdg/MIMETypeRegistryXdg.cpp:
(WebCore::MIMETypeRegistry::preferredExtensionForMIMEType):

Tools:

* TestWebKitAPI/Tests/WebKitGLib/TestDownloads.cpp:
(serverCallback):
(testDownloadTextPlainMIMEType):
(beforeAll):
* TestWebKitAPI/Tests/WebKitGLib/resources/text: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit232SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebCoreplatformxdgMIMETypeRegistryXdgcpp">releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/xdg/MIMETypeRegistryXdg.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit232ToolsChangeLog">releases/WebKitGTK/webkit-2.32/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit232ToolsTestWebKitAPITestsWebKitGLibTestDownloadscpp">releases/WebKitGTK/webkit-2.32/Tools/TestWebKitAPI/Tests/WebKitGLib/TestDownloads.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit232ToolsTestWebKitAPITestsWebKitGLibresourcestext">releases/WebKitGTK/webkit-2.32/Tools/TestWebKitAPI/Tests/WebKitGLib/resources/text</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit232SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (280801 => 280802)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog  2021-08-09 22:49:38 UTC (rev 280801)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog     2021-08-09 22:54:53 UTC (rev 280802)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2021-07-29  Michael Catanzaro  <mcatanzaro@gnome.org>
+
+        [WPE][GTK] .asc file extension is appended to filename of text/plain downloads
+        https://bugs.webkit.org/show_bug.cgi?id=228566
+
+        Reviewed by Adrian Perez de Castro.
+
+        Our MIMETypeRegistry::preferredExtensionForMIMEType returns "asc" for text/plain, possibly
+        because "asc" sorts alphabetically ahead of all other possible file extensions for
+        text/plain, and we just pick the first one. So if the text file does not contain any file
+        extension, we give it a file extension for a GPG signature. Ouch.
+
+        I don't know how to fix it, but we don't need to, because we don't really want to append any
+        file extension for text/plain anyway. That's just annoying. If I download a file named
+        "backtrace" then I don't want it renamed to "backtrace.txt". That would be expected on
+        Windows, but certainly not from WebKitGTK. So I think it's reasonable to have a special case
+        for text/plain.
+
+        * platform/xdg/MIMETypeRegistryXdg.cpp:
+        (WebCore::MIMETypeRegistry::preferredExtensionForMIMEType):
+
</ins><span class="cx"> 2021-04-21  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Use BlobURL::getOriginURL in more places
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebCoreplatformxdgMIMETypeRegistryXdgcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/xdg/MIMETypeRegistryXdg.cpp (280801 => 280802)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/xdg/MIMETypeRegistryXdg.cpp       2021-08-09 22:49:38 UTC (rev 280801)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/xdg/MIMETypeRegistryXdg.cpp  2021-08-09 22:54:53 UTC (rev 280802)
</span><span class="lines">@@ -56,6 +56,9 @@
</span><span class="cx">     if (mimeType.isEmpty())
</span><span class="cx">         return String();
</span><span class="cx"> 
</span><ins>+    if (mimeType.startsWith("text/plain"))
+        return String();
+
</ins><span class="cx">     String returnValue;
</span><span class="cx">     char* extension;
</span><span class="cx">     if (xdg_mime_get_simple_globs(mimeType.utf8().data(), &extension, 1)) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Tools/ChangeLog (280801 => 280802)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Tools/ChangeLog   2021-08-09 22:49:38 UTC (rev 280801)
+++ releases/WebKitGTK/webkit-2.32/Tools/ChangeLog      2021-08-09 22:54:53 UTC (rev 280802)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-07-29  Michael Catanzaro  <mcatanzaro@gnome.org>
+
+        [WPE][GTK] .asc file extension is appended to filename of text/plain downloads
+        https://bugs.webkit.org/show_bug.cgi?id=228566
+
+        Reviewed by Adrian Perez de Castro.
+
+        * TestWebKitAPI/Tests/WebKitGLib/TestDownloads.cpp:
+        (serverCallback):
+        (testDownloadTextPlainMIMEType):
+        (beforeAll):
+        * TestWebKitAPI/Tests/WebKitGLib/resources/text: Added.
+
</ins><span class="cx"> 2021-04-16  Brent Fulgham  <bfulgham@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Perform port blocking earlier in the load
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232ToolsTestWebKitAPITestsWebKitGLibTestDownloadscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Tools/TestWebKitAPI/Tests/WebKitGLib/TestDownloads.cpp (280801 => 280802)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Tools/TestWebKitAPI/Tests/WebKitGLib/TestDownloads.cpp    2021-08-09 22:49:38 UTC (rev 280801)
+++ releases/WebKitGTK/webkit-2.32/Tools/TestWebKitAPI/Tests/WebKitGLib/TestDownloads.cpp       2021-08-09 22:54:53 UTC (rev 280802)
</span><span class="lines">@@ -444,6 +444,8 @@
</span><span class="cx"> 
</span><span class="cx">     if (g_str_equal(path, "/unknown") || g_str_equal(path, "/ua-test"))
</span><span class="cx">         path = "/test.pdf";
</span><ins>+    else if (g_str_equal(path, "/text"))
+        path = "/text";
</ins><span class="cx"> 
</span><span class="cx">     GUniquePtr<char> filePath(g_build_filename(Test::getResourcesDir().data(), path, nullptr));
</span><span class="cx">     char* contents;
</span><span class="lines">@@ -745,6 +747,23 @@
</span><span class="cx">     test->checkDestinationAndDeleteFile(download.get(), expectedFilename.get());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static void testDownloadTextPlainMIMEType(DownloadTest* test, gconstpointer)
+{
+    GRefPtr<WebKitDownload> download = test->downloadURIAndWaitUntilFinishes(kServer->getURIForPath("/text"));
+    g_assert_null(webkit_download_get_web_view(download.get()));
+
+    WebKitURIRequest* request = webkit_download_get_request(download.get());
+    g_assert_true(WEBKIT_IS_URI_REQUEST(request));
+    ASSERT_CMP_CSTRING(webkit_uri_request_get_uri(request), ==, kServer->getURIForPath("/text"));
+
+    WebKitURIResponse* response = webkit_download_get_response(download.get());
+    g_assert_true(WEBKIT_IS_URI_RESPONSE(response));
+    g_assert_cmpstr(webkit_uri_response_get_mime_type(response), ==, "text/plain");
+    g_assert_nonnull(webkit_download_get_destination(download.get()));
+    g_assert_cmpfloat(webkit_download_get_estimated_progress(download.get()), ==, 1);
+    test->checkDestinationAndDeleteFile(download.get(), kServerSuggestedFilename);
+}
+
</ins><span class="cx"> static void testDownloadUserAgent(DownloadTest* test, gconstpointer)
</span><span class="cx"> {
</span><span class="cx">     s_userAgentMap.clear();
</span><span class="lines">@@ -892,6 +911,7 @@
</span><span class="cx">     PolicyResponseDownloadTest::add("Downloads", "policy-decision-download", testPolicyResponseDownload);
</span><span class="cx">     PolicyResponseDownloadTest::add("Downloads", "policy-decision-download-cancel", testPolicyResponseDownloadCancel);
</span><span class="cx">     DownloadTest::add("Downloads", "mime-type", testDownloadMIMEType);
</span><ins>+    DownloadTest::add("Downloads", "text-plain-mime-type", testDownloadTextPlainMIMEType);
</ins><span class="cx">     DownloadTest::add("Downloads", "user-agent", testDownloadUserAgent);
</span><span class="cx">     Test::add("Downloads", "ephemeral-context", testDownloadEphemeralContext);
</span><span class="cx">     // FIXME: Implement keyStroke in WPE.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232ToolsTestWebKitAPITestsWebKitGLibresourcestext"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.32/Tools/TestWebKitAPI/Tests/WebKitGLib/resources/text (0 => 280802)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Tools/TestWebKitAPI/Tests/WebKitGLib/resources/text                               (rev 0)
+++ releases/WebKitGTK/webkit-2.32/Tools/TestWebKitAPI/Tests/WebKitGLib/resources/text  2021-08-09 22:54:53 UTC (rev 280802)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This is a text/plain document!
</ins></span></pre>
</div>
</div>

</body>
</html>