From dev-return-203779-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org Mon Nov 25 20:47:34 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id B6290180607 for ; Mon, 25 Nov 2019 21:47:33 +0100 (CET) Received: (qmail 5109 invoked by uid 500); 25 Nov 2019 20:47:32 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 5096 invoked by uid 99); 25 Nov 2019 20:47:32 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Nov 2019 20:47:32 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 492548B690; Mon, 25 Nov 2019 20:47:32 +0000 (UTC) Date: Mon, 25 Nov 2019 20:47:32 +0000 To: "dev@tomcat.apache.org" Subject: [tomcat] branch 7.0.x updated: Revert the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63815 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157471485218.13247.8790118669555657073@gitbox.apache.org> From: markt@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: tomcat X-Git-Refname: refs/heads/7.0.x X-Git-Reftype: branch X-Git-Oldrev: 4a928c01dc9db25fb5601b8c4800c7f5b617b247 X-Git-Newrev: ef64c6fc9d6a3abdb0b9ea420599783c79d43caf X-Git-Rev: ef64c6fc9d6a3abdb0b9ea420599783c79d43caf X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 ef64c6f Revert the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63815 ef64c6f is described below commit ef64c6fc9d6a3abdb0b9ea420599783c79d43caf Author: Mark Thomas AuthorDate: Mon Nov 25 20:44:37 2019 +0000 Revert the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63815 This triggered various regressions, particularly with daemon.sh --- bin/catalina.sh | 16 ++++++++-------- bin/daemon.sh | 4 ++-- bin/tool-wrapper.sh | 2 +- webapps/docs/changelog.xml | 10 ++++++++++ 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index ca09baa..f873a8f 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -350,7 +350,7 @@ if [ "$1" = "debug" ] ; then echo "Using Security Manager" fi shift - exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \ + exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \ -classpath "$CLASSPATH" \ -sourcepath "$CATALINA_HOME"/../../java \ @@ -361,7 +361,7 @@ if [ "$1" = "debug" ] ; then -Djava.io.tmpdir="$CATALINA_TMPDIR" \ org.apache.catalina.startup.Bootstrap "$@" start else - exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \ + exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \ -classpath "$CLASSPATH" \ -sourcepath "$CATALINA_HOME"/../../java \ @@ -380,7 +380,7 @@ elif [ "$1" = "run" ]; then echo "Using Security Manager" fi shift - eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \ + eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ @@ -390,7 +390,7 @@ elif [ "$1" = "run" ]; then -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start else - eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \ + eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ @@ -448,7 +448,7 @@ elif [ "$1" = "start" ] ; then echo "Using Security Manager" fi shift - eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \ + eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ @@ -460,7 +460,7 @@ elif [ "$1" = "start" ] ; then >> "$CATALINA_OUT" 2>&1 "&" else - eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \ + eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ @@ -513,7 +513,7 @@ elif [ "$1" = "stop" ] ; then fi fi - eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \ -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ @@ -600,7 +600,7 @@ elif [ "$1" = "stop" ] ; then elif [ "$1" = "configtest" ] ; then - eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \ -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ diff --git a/bin/daemon.sh b/bin/daemon.sh index 3c517ba..afa4c89 100755 --- a/bin/daemon.sh +++ b/bin/daemon.sh @@ -208,7 +208,7 @@ case "$1" in -outfile "&1" \ -errfile "&2" \ -classpath "$CLASSPATH" \ - "$LOGGING_CONFIG" "$JAVA_OPTS" "$CATALINA_OPTS" \ + "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ @@ -225,7 +225,7 @@ case "$1" in -outfile "$CATALINA_OUT" \ -errfile "&1" \ -classpath "$CLASSPATH" \ - "$LOGGING_CONFIG" "$JAVA_OPTS" "$CATALINA_OPTS" \ + "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ diff --git a/bin/tool-wrapper.sh b/bin/tool-wrapper.sh index 4162307..35d3075 100755 --- a/bin/tool-wrapper.sh +++ b/bin/tool-wrapper.sh @@ -146,7 +146,7 @@ JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLog # ----- Execute The Requested Command ----------------------------------------- -exec "$_RUNJAVA" "$JAVA_OPTS" $TOOL_OPTS \ +exec "$_RUNJAVA" $JAVA_OPTS $TOOL_OPTS \ -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \ -classpath "$CLASSPATH" \ -Dcatalina.home="$CATALINA_HOME" \ diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ffb28e7..1b49259 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -69,6 +69,16 @@ + + + + Revert the fix for 63815 (quoting the use of + CATALINA_OPTS and JAVA_OPTS when used in shell + scripts to avoid the expansion of *) as it caused various + regressions, particularly with daemon.sh. (markt) + + +
--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org