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/06/09 20:13:35 UTC
[tomcat] branch 8.5.x updated: Fix BZ64501 - Avoid feature not
available by default on Solaris 10
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 1cb2595 Fix BZ64501 - Avoid feature not available by default on Solaris 10
1cb2595 is described below
commit 1cb2595861be406faf224417bb3dd874f9254bc0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 9 21:10:07 2020 +0100
Fix BZ64501 - Avoid feature not available by default on Solaris 10
https://bz.apache.org/bugzilla/show_bug.cgi?id=64501
---
bin/catalina.sh | 6 +++---
bin/daemon.sh | 6 +++---
webapps/docs/changelog.xml | 10 ++++++++++
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 145cdf4..8d98775 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -271,9 +271,9 @@ JAVA_OPTS="$JAVA_OPTS -Djava.protocol.handler.pkgs=org.apache.catalina.webresour
# Check for the deprecated LOGGING_CONFIG
# Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts with "-D..."
if [ -z "$CATALINA_LOGGING_CONFIG" ]; then
- if [ "${LOGGING_CONFIG#*-D}" != "$LOGGING_CONFIG" ]; then
- CATALINA_LOGGING_CONFIG="$LOGGING_CONFIG"
- fi
+ case $LOGGING_CONFIG in
+ -D*) CATALINA_LOGGING_CONFIG="$LOGGING_CONFIG"
+ esac
fi
# Set juli LogManager config file if it is present and an override has not been issued
diff --git a/bin/daemon.sh b/bin/daemon.sh
index 6038e1d..014a350 100755
--- a/bin/daemon.sh
+++ b/bin/daemon.sh
@@ -152,9 +152,9 @@ fi
# Check for the deprecated LOGGING_CONFIG
# Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts with "-D..."
if [ -z "$CATALINA_LOGGING_CONFIG" ]; then
- if [ "${LOGGING_CONFIG#*-D}" != "$LOGGING_CONFIG" ]; then
- CATALINA_LOGGING_CONFIG="$LOGGING_CONFIG"
- fi
+ case $LOGGING_CONFIG in
+ -D*) CATALINA_LOGGING_CONFIG="$LOGGING_CONFIG"
+ esac
fi
# Set juli LogManager config file if it is present and an override has not been issued
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6cdc120..3bd7d26 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -68,6 +68,16 @@
</add>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ <bug>64501</bug>: Refactor the handling of the deprecated
+ <code>LOGGING_CONFIG</code> environment variable to avoid using a POSIX
+ shell feature that is not available by default on Solaris 10. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+>>>>>>> 4bd5c80e60... Fix BZ64501 - Avoid feature not available by default on Solaris 10
</section>
<section name="Tomcat 8.5.56 (markt)" rtext="2020-06-07">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org