This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 371faea2 Fix calling service.bat from CATALINA_HOME 371faea2 is described below commit 371faea24bb9716ed9ff749ad6674f51c61ef701 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Sep 29 15:16:04 2020 +0100 Fix calling service.bat from CATALINA_HOME --- bin/service.bat | 4 ++-- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/service.bat b/bin/service.bat index b170e64..b6a2d86 100755 --- a/bin/service.bat +++ b/bin/service.bat @@ -75,8 +75,8 @@ rem Check the environment rem Guess CATALINA_HOME if not defined if not "%CATALINA_HOME%" == "" goto gotHome set "CATALINA_HOME=%cd%" -if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" goto okHome -if exist "%CATALINA_HOME%\bin\%SERVICE_NAME%.exe" goto okHome +if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" goto gotHome +if exist "%CATALINA_HOME%\bin\%SERVICE_NAME%.exe" goto gotHome rem CD to the upper dir cd .. set "CATALINA_HOME=%cd%" diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 5cbbe9a..3f02e3a 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -94,6 +94,10 @@ Don't send the Keep-Alive response header if the connection has been explicitly closed. (markt) </fix> + <fix> + Fix running service.bat when called from <code>$CATALINA_HOME</code>. + (markt) + </fix> </changelog> </subsection> <subsection name="Jasper"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org