This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 7322521761 Remove unnecessary setting of java.protocol.handler.pkgs
7322521761 is described below
commit 7322521761fd04d72348903d7177b6e6132ff289
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Mar 2 17:30:56 2023 +0000
Remove unnecessary setting of java.protocol.handler.pkgs
---
bin/catalina.bat | 3 ---
bin/catalina.sh | 3 ---
webapps/docs/changelog.xml | 5 +++++
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/bin/catalina.bat b/bin/catalina.bat
index ce73b88044..068cd283bc 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -203,9 +203,6 @@ set "JSSE_OPTS=-Djdk.tls.ephemeralDHKeySize=2048"
:gotJsseOpts
set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%"
-rem Register custom URL handlers
-set "JAVA_OPTS=%JAVA_OPTS%
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
-
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 d987738b27..a7b14b6957 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -251,9 +251,6 @@ if [ -z "$JSSE_OPTS" ] ; then
fi
JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS"
-# Register custom URL handlers
-JAVA_OPTS="$JAVA_OPTS
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
-
# 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
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 64564ef3a8..232e9c8f5f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -117,6 +117,11 @@
<code>text/javascript</code> as the media type for JavaScript rather
than <code>application/javascript</code>. (markt)
</fix>
+ <scode>
+ Tomcat no longer sets the <code>java.protocol.handler.pkgs</code>
system
+ property when starting. Users are now free to configure this property
if
+ they wish. (markt)
+ </scode>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
