This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2e692c7abf041e1784390aef5f7f89f1d9563b95
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 15 17:15:36 2020 +0100
Add support for application/wasm media type
---
conf/web.xml | 4 ++++
java/org/apache/catalina/startup/MimeTypeMappings.properties | 1 +
res/scripts/check-mime.pl | 1 +
webapps/docs/changelog.xml | 4 ++++
4 files changed, 10 insertions(+)
diff --git a/conf/web.xml b/conf/web.xml
index aa62dde..dccac75 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -4232,6 +4232,10 @@
<mime-type>application/x-doom</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>wasm</extension>
+ <mime-type>application/wasm</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>wav</extension>
<mime-type>audio/x-wav</mime-type>
</mime-mapping>
diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties
b/java/org/apache/catalina/startup/MimeTypeMappings.properties
index a043c5b..84a7e33 100644
--- a/java/org/apache/catalina/startup/MimeTypeMappings.properties
+++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties
@@ -910,6 +910,7 @@ vtu=model/vnd.vtu
vxml=application/voicexml+xml
w3d=application/x-director
wad=application/x-doom
+wasm=application/wasm
wav=audio/x-wav
wax=audio/x-ms-wax
wbmp=image/vnd.wap.wbmp
diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl
index 8441f31..a589022 100755
--- a/res/scripts/check-mime.pl
+++ b/res/scripts/check-mime.pl
@@ -94,6 +94,7 @@ my %TOMCAT_ONLY = qw(
qtif image/x-quicktime
shtml text/x-server-parsed-html
ulw audio/basic
+ wasm application/wasm
z application/x-compress
);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5afb202..bcba434 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -66,6 +66,10 @@
<bug>64470</bug>: The default value of the solidus handling should
reflect the associated system property. (remm)
</fix>
+ <add>
+ Add <code>application/wasm</code> to the media types recognised by
+ Tomcat. Based on a PR by Thiago Henrique Hüpner. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
