You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/06/15 16:16:04 UTC

[tomcat] branch master updated (9c84478 -> 54898ee)

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

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


    from 9c84478  3.0 is a valid version for JSP documents in JSP 3.0 onwards
     new ba4bcfb  Remove unnecessary entry now Tomcat checks extensions case insensitively
     new 54898ee  Add support for application/wasm media type

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 conf/web.xml                                                 | 4 ++++
 java/org/apache/catalina/startup/MimeTypeMappings.properties | 1 +
 res/scripts/check-mime.pl                                    | 2 +-
 webapps/docs/changelog.xml                                   | 4 ++++
 4 files changed, 10 insertions(+), 1 deletion(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 02/02: Add support for application/wasm media type

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 54898ee4c0974fc3280abcb753e54d76d2149d2c
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 a0f604a..ef80563 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -4258,6 +4258,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 d37b070..5d691af 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -65,6 +65,10 @@
         cache implementation that could lead to
         <code>NullPointerException</code>s during class loading. (markt)
       </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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 01/02: Remove unnecessary entry now Tomcat checks extensions case insensitively

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit ba4bcfbda79bc655b4283e160981f9f4d026f181
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 15 17:02:28 2020 +0100

    Remove unnecessary entry now Tomcat checks extensions case insensitively
---
 res/scripts/check-mime.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl
index 344f801..8441f31 100755
--- a/res/scripts/check-mime.pl
+++ b/res/scripts/check-mime.pl
@@ -95,7 +95,6 @@ my %TOMCAT_ONLY = qw(
     shtml text/x-server-parsed-html
     ulw audio/basic
     z application/x-compress
-    Z application/x-compress
 );
 
 # Mime types, that are defined differently


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org