Author: markt
Date: Wed May 19 16:02:53 2010
New Revision: 946247
URL: http://svn.apache.org/viewvc?rev=946247&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48840
If CDPATH is set, cd may result in output to stdout. Swallow the output. This
is safe since the script outputs the value used for CATALINA_HOME so any issues
will be visible then.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=946247&r1=946246&r2=946247&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed May 19 16:02:53 2010
@@ -71,16 +71,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48840
- If CDPATH is set, cd may result in output to stdout.
- Swallow the output. This is safe since the script outputs the value used for
- CATALINA_HOME so any issues will be visible then.
- Patch provided by mdietze
- http://svn.apache.org/viewvc?rev=928732&view=rev
- http://svn.apache.org/viewvc?rev=945835&view=rev (rjung's review comment)
- +1: markt, kkolinko, rjung
- -1:
-
* Fix possible overflows when calculating session statistics
Fixes a) miscalculating the "average" because of multiplication overflow,
b) ArithmeticException division by zero when numExpired overflows.
Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh?rev=946247&r1=946246&r2=946247&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh Wed May 19
16:02:53 2010
@@ -81,7 +81,7 @@ done
PRGDIR=`dirname "$PRG"`
# Only set CATALINA_HOME if not already set
-[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
+[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
# Ensure that any user defined CLASSPATH variables are not used on startup,
# but allow them to be specified in setenv.sh, in rare case when it is needed.
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=946247&r1=946246&r2=946247&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed May 19
16:02:53 2010
@@ -50,6 +50,10 @@
Update to Apache Commons DBCP 1.3. (markt)
</update>
<fix>
+ <bug>48840</bug>: Swallow output (if any) from use of cd when
determining
+ $CATALINA_HOME in catalina.sh script. Patch provided by mdietze.
(markt)
+ </fix>
+ <fix>
<bug>49236</bug>: Do not use indexing when packing Tomcat JARs.
(kkolinko)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
