commit: 75da24d75d5fd2f10fc0c3dcfda5beb6c948fda1
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May 14 13:56:32 2014 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May 14 13:56:32 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=75da24d7
Attempt to fix stop of apache with mod_perl in apache-2.2 as well (bug #503986)
---
2.2/init/apache2.initd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd
index e3bc921..2f19cc4 100755
--- a/2.2/init/apache2.initd
+++ b/2.2/init/apache2.initd
@@ -106,7 +106,7 @@ stop() {
${APACHE2} ${APACHE2_OPTS} -k stop
local i=0 retval=0
- while ( test -f "${PIDFILE}" && pgrep -P ${PID} apache2 >/dev/null ) \
+ while ( test -f "${PIDFILE}" || pgrep -P ${PID} apache2 >/dev/null ) \
&& [ $i -lt ${TIMEOUT} ]; do
sleep 1 && i=$(expr $i + 1)
done
