You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2021/02/04 08:33:51 UTC

[openmeetings] branch master updated: [OPENMEETINGS-2519] web.xml is merged with latest from Tomcat

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

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 9c38551  [OPENMEETINGS-2519] web.xml is merged with latest from Tomcat
9c38551 is described below

commit 9c3855154fc29bf8186dfe7b2bc1be18781069e5
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Feb 4 15:33:34 2021 +0700

    [OPENMEETINGS-2519] web.xml is merged with latest from Tomcat
---
 openmeetings-server/src/main/assembly/conf/web.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openmeetings-server/src/main/assembly/conf/web.xml b/openmeetings-server/src/main/assembly/conf/web.xml
index f10e8b7..8383096 100644
--- a/openmeetings-server/src/main/assembly/conf/web.xml
+++ b/openmeetings-server/src/main/assembly/conf/web.xml
@@ -543,7 +543,7 @@
   <!-- this to work you will need to uncomment the .shtml mime type         -->
   <!-- definition towards the bottom of this file.                          -->
   <!-- The contentType init param allows you to apply SSI processing to JSP -->
-  <!-- pages, javascript, or any other content you wish.  This filter       -->
+  <!-- pages, JavaScript, or any other content you wish.  This filter       -->
   <!-- supports the following initialization parameters (default values are -->
   <!-- in square brackets):                                                 -->
   <!--                                                                      -->
@@ -4253,6 +4253,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>
@@ -4658,10 +4662,6 @@
         <mime-type>application/x-compress</mime-type>
     </mime-mapping>
     <mime-mapping>
-        <extension>Z</extension>
-        <mime-type>application/x-compress</mime-type>
-    </mime-mapping>
-    <mime-mapping>
         <extension>z1</extension>
         <mime-type>application/x-zmachine</mime-type>
     </mime-mapping>