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 3cf8893 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63689
display name
3cf8893 is described below
commit 3cf88939bfb684a4755aa05ec3b07d7a736757f9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 3 20:37:52 2019 +0100
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63689 display name
Correct a regression in the fix for
https://bz.apache.org/bugzilla/show_bug.cgi?id=63285 that meant the
display name was not set.
---
bin/service.bat | 2 +-
webapps/docs/changelog.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/bin/service.bat b/bin/service.bat
index 0aee372..d9188ec 100755
--- a/bin/service.bat
+++ b/bin/service.bat
@@ -210,7 +210,7 @@ if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" (
"%EXECUTABLE%" //IS//%SERVICE_NAME% ^
--Description "Apache Tomcat @VERSION@ Server -
https://tomcat.apache.org/"; ^
- --DisplayName "%DISPLAYNAME%" ^
+ --DisplayName "Apache Tomcat @VERSION_MAJOR_MINOR@ %SERVICE_NAME%" ^
--Install "%EXECUTABLE%" ^
--LogPath "%CATALINA_BASE%\logs" ^
--StdOutput auto ^
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2b1c5db..115f12a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,11 @@
Fix <code>JSSE_OPTS</code> quoting in <code>catalina.bat</code>.
Contributed by Peter Uhnak. (fschumacher)
</fix>
+ <fix>
+ <bug>63689</bug>: Correct a regression in the fix for <bug>63285</bug>
+ that meant that when installing a service, the service display name was
+ not set. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
