This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new d93b96e085 Remove unnecessary configuration
d93b96e085 is described below
commit d93b96e085958ef9e9d48e3491f9dc83bbc24bf3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 20 12:12:47 2025 +0000
Remove unnecessary configuration
Tomcat 11 requires Java 17 where this cache is disabled by default.
Disabling here doesn't change anything.
---
bin/catalina.bat | 7 -------
bin/catalina.sh | 7 -------
2 files changed, 14 deletions(-)
diff --git a/bin/catalina.bat b/bin/catalina.bat
index 88bf844c14..78a7eb9d9f 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -203,13 +203,6 @@ set "JSSE_OPTS=-Djdk.tls.ephemeralDHKeySize=2048"
:gotJsseOpts
set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%"
-rem Disable the global canonical file name cache to protect against
CVE-2024-56337
-rem Note: The cache is disabled by default in Java 12 to 20 inclusive
-rem The cache is removed in Java 21 onwards
-rem Need to set this here as java.io.FileSystem caches this in a static field
during class
-rem initialisation so it needs to be set before any file system access
-set "JAVA_OPTS=%JAVA_OPTS% -Dsun.io.useCanonCaches=false"
-
if not "%CATALINA_LOGGING_CONFIG%" == "" goto noJuliConfig
set CATALINA_LOGGING_CONFIG=-Dnop
if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig
diff --git a/bin/catalina.sh b/bin/catalina.sh
index c5a996cb65..ee679ad0c6 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -251,13 +251,6 @@ if [ -z "$JSSE_OPTS" ] ; then
fi
JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS"
-# Disable the global canonical file name cache to protect against
CVE-2024-56337
-# Note: The cache is disabled by default in Java 12 to 20 inclusive
-# The cache is removed in Java 21 onwards
-# Need to set this here as java.io.FileSystem caches this in a static field
during class
-# initialisation so it needs to be set before any file system access
-JAVA_OPTS="$JAVA_OPTS -Dsun.io.useCanonCaches=false"
-
# Set juli LogManager config file if it is present and an override has not
been issued
if [ -z "$CATALINA_LOGGING_CONFIG" ]; then
if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
