diff options
author | 2013-11-22 08:45:23 +0000 | |
---|---|---|
committer | 2013-11-22 08:45:23 +0000 | |
commit | 1c38eac68bf487280abf62f4c65839a1a461b8bc (patch) | |
tree | 6d409d433ec28cf752f2c66da74d51d38824e79d /www-servers/apache | |
parent | Bump (diff) | |
download | gentoo-2-1c38eac68bf487280abf62f4c65839a1a461b8bc.tar.gz gentoo-2-1c38eac68bf487280abf62f4c65839a1a461b8bc.tar.bz2 gentoo-2-1c38eac68bf487280abf62f4c65839a1a461b8bc.zip |
Fixed startup of apache when pidfile exists (bug #492222)
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'www-servers/apache')
-rw-r--r-- | www-servers/apache/ChangeLog | 7 | ||||
-rw-r--r-- | www-servers/apache/files/gentoo-apache-2.2.23-initd_fixups.patch | 16 |
2 files changed, 14 insertions, 9 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index a6ebc4edfc11..e361f7791cc0 100644 --- a/www-servers/apache/ChangeLog +++ b/www-servers/apache/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/apache # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.249 2013/11/20 17:50:40 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.250 2013/11/22 08:45:22 polynomial-c Exp $ + + 22 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> + files/gentoo-apache-2.2.23-initd_fixups.patch: + Fixed startup of apache when pidfile exists. Thanks to Roman Barczyński who + reported this in bug #492222. *apache-2.2.26 (20 Nov 2013) diff --git a/www-servers/apache/files/gentoo-apache-2.2.23-initd_fixups.patch b/www-servers/apache/files/gentoo-apache-2.2.23-initd_fixups.patch index cc57c854ca82..92a073117a11 100644 --- a/www-servers/apache/files/gentoo-apache-2.2.23-initd_fixups.patch +++ b/www-servers/apache/files/gentoo-apache-2.2.23-initd_fixups.patch @@ -1,18 +1,18 @@ -Make the init script recognize failed start and stop more reliably. - -2013-11-07 - Lars Wendler <polynomial-c@gentoo.org> - --- gentoo-apache-2.2.23/init/apache2.initd +++ gentoo-apache-2.2.23/init/apache2.initd -@@ -77,12 +77,13 @@ +@@ -77,12 +77,16 @@ # Use start stop daemon to apply system limits #347301 start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start - i=0 +- while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do + local i=0 retval=1 - while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do ++ while [ $i -lt ${TIMEOUT} ] ; do ++ if [ -e "${PIDFILE}" ] ; then ++ retval=0 ++ break ++ fi sleep 1 && i=$(expr $i + 1) -+ [ -e "${PIDFILE}" ] && retval=0 done - eend $(test $i -lt ${TIMEOUT}) @@ -20,7 +20,7 @@ Make the init script recognize failed start and stop more reliably. } stop() { -@@ -101,13 +102,14 @@ +@@ -101,13 +105,14 @@ ebegin "Stopping ${SVCNAME}" ${APACHE2} ${APACHE2_OPTS} -k stop |