This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 69b8f398d6 Fix BZ 68378 - add mime type for mjs and others - aligning 
with httpd
69b8f398d6 is described below

commit 69b8f398d64f336d4954d69aead1b19f5126fd4f
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 f81950e00e..5d5e920273 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -1763,6 +1763,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>
@@ -2467,6 +2471,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>
@@ -2905,6 +2913,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 462a848a8e..7e2812e97f 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 8.5.98 (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

Reply via email to