This is an automated email from the ASF dual-hosted git repository.
markt 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 0453bc5c9c Fix BZ 66829 - fix quoting
0453bc5c9c is described below
commit 0453bc5c9c06e228dbb39e62a3506a7d3ffae713
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Aug 3 19:32:44 2023 +0100
Fix BZ 66829 - fix quoting
https://bz.apache.org/bugzilla/show_bug.cgi?id=66829
---
bin/catalina.bat | 10 +++++-----
bin/setclasspath.bat | 4 ++--
webapps/docs/changelog.xml | 5 +++++
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/bin/catalina.bat b/bin/catalina.bat
index a5cf1a92f6..9c55ae940e 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -89,11 +89,11 @@ rem "-Djdk.tls.ephemeralDHKeySize=2048"
rem
rem CATALINA_LOGGING_CONFIG (Optional) Override Tomcat's logging config file
rem Example (all one line)
-rem set
CATALINA_LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
+rem set
CATALINA_LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
rem
rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager
rem Example (all one line)
-rem set
LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
+rem set
LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
rem
rem TITLE (Optional) Specify the title of Tomcat window. The
default
rem TITLE is Tomcat if it's not specified.
@@ -238,7 +238,7 @@ echo Using JAVA_HOME: "%JAVA_HOME%"
echo Using CLASSPATH: "%CLASSPATH%"
echo Using CATALINA_OPTS: "%CATALINA_OPTS%"
-set _EXECJAVA=%_RUNJAVA%
+set _EXECJAVA="%_RUNJAVA%"
set MAINCLASS=org.apache.catalina.startup.Bootstrap
set ACTION=start
set SECURITY_POLICY_FILE=
@@ -285,7 +285,7 @@ goto end
:doDebug
shift
-set _EXECJAVA=%_RUNJDB%
+set _EXECJAVA="%_RUNJDB%"
set DEBUG_OPTS=-sourcepath "%CATALINA_HOME%\..\..\java"
if not ""%1"" == ""-security"" goto execCmd
shift
@@ -304,7 +304,7 @@ goto execCmd
:doStart
shift
if "%TITLE%" == "" set TITLE=Tomcat
-set _EXECJAVA=start "%TITLE%" %_RUNJAVA%
+set _EXECJAVA=start "%TITLE%" "%_RUNJAVA%"
if not ""%1"" == ""-security"" goto execCmd
shift
echo Using Security Manager
diff --git a/bin/setclasspath.bat b/bin/setclasspath.bat
index 62e5d70cb3..ded6ac13b6 100755
--- a/bin/setclasspath.bat
+++ b/bin/setclasspath.bat
@@ -77,13 +77,13 @@ rem Don't override _RUNJAVA if the user has set it
previously
if not "%_RUNJAVA%" == "" goto gotRunJava
rem Set standard command for invoking Java.
rem Also note the quoting as JRE_HOME may contain spaces.
-set _RUNJAVA="%JRE_HOME%\bin\java.exe"
+set "_RUNJAVA=%JRE_HOME%\bin\java.exe"
:gotRunJava
rem Don't override _RUNJDB if the user has set it previously
rem Also note the quoting as JAVA_HOME may contain spaces.
if not "%_RUNJDB%" == "" goto gotRunJdb
-set _RUNJDB="%JAVA_HOME%\bin\jdb.exe"
+set "_RUNJDB=%JAVA_HOME%\bin\jdb.exe"
:gotRunJdb
goto end
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c27bf82c50..f67c67a10b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -169,6 +169,11 @@
Improvements to Japanese translations. Contributed by tak7iji and
Shirayuking. (markt)
</add>
+ <fix>
+ <bug>66829</bug>: Fix quoting so users can use the
<code>_RUNJAVA</code>
+ environment variable as intended on Windows when the path to the Java
+ executable contains spaces. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
