[Pkg-apache-commits] r1226 - in /trunk/apache2: apache2.2-common.apache2.init changelog

[sf at alioth.debian.org]

Author: sf
Date: Sun Aug 29 13:28:37 2010
New Revision: 1226

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1226
Log:
revert the wait on graceful reload change.
This has to be changed in mod_php, see #589386

Modified:
    trunk/apache2/apache2.2-common.apache2.init
    trunk/apache2/changelog

Modified: trunk/apache2/apache2.2-common.apache2.init
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.apache2.init?rev=1226&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.apache2.init (original)
+++ trunk/apache2/apache2.2-common.apache2.init Sun Aug 29 13:28:37 2010
@@ -167,24 +167,6 @@
 	fi
 }
 
-# After starting, apache2 needs some time until it accepts SIGHUP/SIGUSR1.
-# Check if it has just been started. If yes, wait a bit.
-apache_wait_before_reload() {
-	# modtime of pidfile in seconds since epoch
-	START=$(stat -c %Y "$PIDFILE" 2>/dev/null || true)
-	[ -n "$START" ] || return 0
-	# now in seconds since epoch
-	NOW=$(date +%s)
-	if [ $(( $NOW - $START )) -le 2 ] ; then
-		echo -n " ... waiting "
-		sleep 2
-	fi
-
-	# Reloading shortly after the last reload is racy.
-	# To be save, force a wait on the next reload.
-	touch "$PIDFILE"
-}
-
 case $1 in
 	start)
 		log_daemon_msg "Starting web server" "apache2"
@@ -220,7 +202,6 @@
 		else
 			log_daemon_msg "Stopping web server" "apache2"
 		fi
-		apache_wait_before_reload
 		if $APACHE2CTL graceful-stop; then
                         log_end_msg 0
                 else
@@ -235,7 +216,6 @@
                 fi
                 log_daemon_msg "Reloading web server config" "apache2"
 		if pidof_apache > /dev/null ; then
-                    apache_wait_before_reload
                     if $APACHE2CTL graceful $2 ; then
                         log_end_msg 0
                     else

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1226&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sun Aug 29 13:28:37 2010
@@ -1,9 +1,6 @@
 apache2 (2.2.16-2) UNRELEASED; urgency=low
 
   * Force -j1 for 'make install' to fix occasional FTBFS. Closes: #593036
-  * If the init script's reload action is called immediately after the start
-    action, wait a bit to allow apache2 to start and register its signal
-    handlers. Closes: #589386, LP: #603192
   * Add a note about the new behaviour of SSL/TLS renegotiation and the new
     directive SSLInsecureRenegotiation to NEWS.Debian. Closes: #593334
   * Support 'graceful' as alias for 'reload' in the init script.