Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 025DF10852 for ; Thu, 1 Aug 2013 10:44:37 +0000 (UTC) Received: (qmail 33378 invoked by uid 500); 1 Aug 2013 10:44:34 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 33322 invoked by uid 500); 1 Aug 2013 10:44:34 -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 33312 invoked by uid 99); 1 Aug 2013 10:44:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Aug 2013 10:44:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Aug 2013 10:44:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 748F72388A02 for ; Thu, 1 Aug 2013 10:44:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1509163 - in /tomcat/tc7.0.x/trunk: ./ bin/catalina.sh webapps/docs/changelog.xml Date: Thu, 01 Aug 2013 10:44:09 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130801104409.748F72388A02@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Thu Aug 1 10:44:08 2013 New Revision: 1509163 URL: http://svn.apache.org/r1509163 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55336 Correctly quote parameters passed to eval Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/bin/catalina.sh tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1509161 Modified: tomcat/tc7.0.x/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina.sh?rev=1509163&r1=1509162&r2=1509163&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/bin/catalina.sh (original) +++ tomcat/tc7.0.x/trunk/bin/catalina.sh Thu Aug 1 10:44:08 2013 @@ -309,20 +309,20 @@ elif [ "$1" = "run" ]; then echo "Using Security Manager" fi shift - eval exec \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ + eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ - -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start else - eval exec \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start fi @@ -373,22 +373,22 @@ elif [ "$1" = "start" ] ; then echo "Using Security Manager" fi shift - eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ + eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ - -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start \ >> "$CATALINA_OUT" 2>&1 "&" else - eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start \ >> "$CATALINA_OUT" 2>&1 "&" @@ -434,11 +434,11 @@ elif [ "$1" = "stop" ] ; then fi fi - eval \"$_RUNJAVA\" $LOGGING_MANAGER $JAVA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" stop if [ ! -z "$CATALINA_PID" ]; then @@ -501,11 +501,11 @@ elif [ "$1" = "stop" ] ; then elif [ "$1" = "configtest" ] ; then - eval \"$_RUNJAVA\" $LOGGING_MANAGER $JAVA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap configtest result=$? if [ $result -ne 0 ]; then Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1509163&r1=1509162&r2=1509163&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Aug 1 10:44:08 2013 @@ -238,6 +238,11 @@ path is not set and it is not found in $CATALINA_BASE, look in $CATALINA_HOME as well. (markt) + + 55336: Correctly escape parameters passed to eval in the + catalina.sh script to ensure that Tomcat starts when installed on a path + that contains multiple consecutive spaces. (markt) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org