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/10/02 12:30:47 UTC
[tomcat] branch 9.0.x updated: Complete the fix for BZ 63815
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7ef3f06 Complete the fix for BZ 63815
7ef3f06 is described below
commit 7ef3f063f1146449461a3abf101d81e36183fef8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 2 13:28:44 2020 +0100
Complete the fix for BZ 63815
https://bz.apache.org/bugzilla/show_bug.cgi?id=63815
Note that users that wish to pass quoted system properties when using
debug *must* use a JRE that includes the fix for
https://bugs.openjdk.java.net/browse/JDK-8234808
---
bin/catalina.sh | 8 ++------
webapps/docs/changelog.xml | 7 +++++++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 7e1470d..3f8e5cd 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -365,10 +365,6 @@ if [ "$1" = "jpda" ] ; then
shift
fi
-# TODO: Bugzilla 63815
-# This doesn't currently work (and can't be made to work) if values used in
-# CATALINA_OPTS and/or JAVA_OPTS require quoting. See:
-# https://bugs.openjdk.java.net/browse/JDK-8234808
if [ "$1" = "debug" ] ; then
if $os400; then
echo "Debug command not available on OS400"
@@ -380,7 +376,7 @@ if [ "$1" = "debug" ] ; then
echo "Using Security Manager"
fi
shift
- exec "$_RUNJDB" "$CATALINA_LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
+ eval exec "\"$_RUNJDB\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \
-D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
-classpath "$CLASSPATH" \
-sourcepath "$CATALINA_HOME"/../../java \
@@ -391,7 +387,7 @@ if [ "$1" = "debug" ] ; then
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
org.apache.catalina.startup.Bootstrap "$@" start
else
- exec "$_RUNJDB" "$CATALINA_LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
+ eval exec "\"$_RUNJDB\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \
-D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
-classpath "$CLASSPATH" \
-sourcepath "$CATALINA_HOME"/../../java \
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index decf6f3..6f911e9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -201,6 +201,13 @@
Fix running service.bat when called from <code>$CATALINA_HOME</code>.
(markt)
</fix>
+ <fix>
+ Complete the fix for <bug>63815</bug>. Users wishing to use system
+ properties that require quoting with <code>catalina.sh</code> and the
+ <code>debug</code> option must use a JRE that includes the fix for <a
+ href="https://bugs.openjdk.java.net/browse/JDK-8234808">JDK-8234808</a>.
+ (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org