This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 3e1b8dd4d2 Fix BZ 68378 - add mime type for mjs and others - aligning
with httpd
3e1b8dd4d2 is described below
commit 3e1b8dd4d25e2e1f2378054dc9efde9d02cc75f9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 2 09:21:54 2024 +0000
Fix BZ 68378 - add mime type for mjs and others - aligning with httpd
---
conf/web.xml | 12 ++++++++++++
webapps/docs/changelog.xml | 11 +++++++++++
2 files changed, 23 insertions(+)
diff --git a/conf/web.xml b/conf/web.xml
index d01ab9b005..085d84e82c 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -1770,6 +1770,10 @@
<extension>ggb</extension>
<mime-type>application/vnd.geogebra.file</mime-type>
</mime-mapping>
+ <mime-mapping>
+ <extension>ggs</extension>
+ <mime-type>application/vnd.geogebra.slides</mime-type>
+ </mime-mapping>
<mime-mapping>
<extension>ggt</extension>
<mime-type>application/vnd.geogebra.tool</mime-type>
@@ -2474,6 +2478,10 @@
<extension>mjp2</extension>
<mime-type>video/mj2</mime-type>
</mime-mapping>
+ <mime-mapping>
+ <extension>mjs</extension>
+ <mime-type>text/javascript</mime-type>
+ </mime-mapping>
<mime-mapping>
<extension>mk3d</extension>
<mime-type>video/x-matroska</mime-type>
@@ -2912,6 +2920,10 @@
<extension>oprc</extension>
<mime-type>application/vnd.palm</mime-type>
</mime-mapping>
+ <mime-mapping>
+ <extension>opus</extension>
+ <mime-type>audio/ogg</mime-type>
+ </mime-mapping>
<mime-mapping>
<extension>org</extension>
<mime-type>application/vnd.lotus-organizer</mime-type>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4ee4ad02bf..558e4bd850 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,17 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 10.1.18 (schultz)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <update>
+ <bug>68378</bug>: Align extension to MIME type mappings in the global
+ web.xml with those in httpd by adding
+ <code>application/vnd.geogebra.slides</code> for <code>ggs</code>,
+ <code>text/javascript</code> for <code>mjs</code> and
+ <code>audio/ogg</code> for opus. (markt)
+ </update>
+ </changelog>
+ </subsection>
<subsection name="Coyote">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
