Author: markt Date: Fri Dec 20 09:26:41 2013 New Revision: 1552554 URL: http://svn.apache.org/r1552554 Log: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55268 Back-port of r1503852 from Tomcat 7.0.x. Add optional --service-start-wait-time command-line option to bin/daemon.sh to change service start wait time from default of 10 seconds. Patch by schultz
Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/bin/daemon.sh tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1494143,1503851,1505843 Merged /tomcat/tc7.0.x/trunk:r1503852,1505844 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1552554&r1=1552553&r2=1552554&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Dec 20 09:26:41 2013 @@ -40,15 +40,6 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, schultz -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55268 - Back-port of r1503852 from Tomcat 7.0.x. - Add optional --service-start-wait-time command-line option to bin/daemon.sh - to change service start wait time from default of 10 seconds. - http://svn.apache.org/r1503852 - http://svn.apache.org/r1505844 - +1: schultz, kkolinko, markt - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55266 https://issues.apache.org/bugzilla/attachment.cgi?id=30608&action=diff Parse session ID before redirect as session ID may need to be encoded Modified: tomcat/tc6.0.x/trunk/bin/daemon.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/daemon.sh?rev=1552554&r1=1552553&r2=1552554&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/daemon.sh (original) +++ tomcat/tc6.0.x/trunk/bin/daemon.sh Fri Dec 20 09:26:41 2013 @@ -62,6 +62,11 @@ do shift; shift; continue ;; + --service-start-wait-time ) + SERVICE_START_WAIT_TIME="$2" + shift; shift; + continue + ;; * ) break ;; @@ -102,6 +107,8 @@ test ".$CATALINA_HOME" = . && CATALINA_H test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME" test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap test ".$JSVC" = . && JSVC="$CATALINA_BASE/bin/jsvc" +# Set the default service-start wait time if necessary +test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 # 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. @@ -167,7 +174,7 @@ case "$1" in $JSVC_OPTS \ -java-home "$JAVA_HOME" \ -pidfile "$CATALINA_PID" \ - -wait 10 \ + -wait "$SERVICE_START_WAIT_TIME" \ -nodetach \ -outfile "&1" \ -errfile "&2" \ @@ -185,7 +192,7 @@ case "$1" in -java-home "$JAVA_HOME" \ -user $TOMCAT_USER \ -pidfile "$CATALINA_PID" \ - -wait 10 \ + -wait "$SERVICE_START_WAIT_TIME" \ -outfile "$CATALINA_OUT" \ -errfile "&1" \ -classpath "$CLASSPATH" \ Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1552554&r1=1552553&r2=1552554&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Dec 20 09:26:41 2013 @@ -64,6 +64,11 @@ <bug>55404</bug>: Log warnings about using security roles in web.xml as warnings. (markt) </fix> + <fix> + <bug>55268</bug>: Added optional --service-start-wait-time + command-line option to change service start wait time from default + of 10 seconds. (schultz) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org