This is an automated email from the ASF dual-hosted git repository.
ChristopherSchultz pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 7f40791d93 Avoid re-evaluation of command-line arguments
7f40791d93 is described below
commit 7f40791d93acc4ebdb23cc2955785ff67db564e0
Author: Christopher Schultz <[email protected]>
AuthorDate: Tue Oct 20 08:22:57 2026 -0400
Avoid re-evaluation of command-line arguments
---
bin/tool-wrapper.sh | 10 ++++++----
webapps/docs/changelog.xml | 8 ++++++--
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/bin/tool-wrapper.sh b/bin/tool-wrapper.sh
index 5a7f4b2860..aeeaa0d8b5 100755
--- a/bin/tool-wrapper.sh
+++ b/bin/tool-wrapper.sh
@@ -126,7 +126,9 @@ JAVA_OPTS="$JAVA_OPTS
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLog
# ----- Execute The Requested Command -----------------------------------------
-eval exec "\"$_RUNJAVA\"" "$JAVA_OPTS" "$TOOL_OPTS" \
- -classpath "\"$CLASSPATH\"" \
- -Dcatalina.home="\"$CATALINA_HOME\"" \
- org.apache.catalina.startup.Tool "$@"
+eval "set -- $JAVA_OPTS $TOOL_OPTS \
+ -classpath \"\$CLASSPATH\" \
+ -Dcatalina.home=\"\$CATALINA_HOME\" \
+ org.apache.catalina.startup.Tool \"\$@\""
+
+exec "$_RUNJAVA" "$@"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index be7615ad25..fcf6538e09 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -664,13 +664,17 @@
<subsection name="Other">
<changelog>
<update>
- Bump spotbugs to 4.10.4.
+ Bump spotbugs to 4.10.4. (schultz)
</update>
<update>
<bug>69902</bug>: Change the ZIP distribution to store the same file
and directory permissions as the tar.gz distribution so that the
scripts in <code>bin</code> are executable when the archive is
- extracted on a Unix platform.
+ extracted on a Unix platform. (schultz)
+ </update>
+ <update>
+ Avoid re-evaluation of command-line arguments in tool-wrapper.sh.
+ (schultz)
</update>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
