[tomcat] branch 7.0.x updated: Fix BZ64501 - Avoid feature not available by default on Solaris 10

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
     new ca880df  Fix BZ64501 - Avoid feature not available by default on 
Solaris 10
ca880df is described below

commit ca880dfd4a08cb93b84cdbec153321512ce09fc3
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 | 5 +++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/bin/catalina.sh b/bin/catalina.sh
index 013de4f..642d22d 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -267,9 +267,9 @@ JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS"
 # 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 0aa5c79..5afb202 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,11 @@
         Resolver Ant Tasks to upload artifacts to the ASF Maven repository (and
         from there to Maven Central). (markt)
       </update>
+      <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>
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org