summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-05-14 15:55:37 +0200
committerLars Wendler <polynomial-c@gentoo.org>2014-05-14 15:55:37 +0200
commitc0d81cf2642f16a9b2e3137d491d708b3b2eb6ef (patch)
tree81c6660145fbe1619af91c8544f315fc3ffe5cce
parentReplaced some bad host directives (bug #509772) (diff)
downloadapache-c0d81cf2642f16a9b2e3137d491d708b3b2eb6ef.tar.gz
apache-c0d81cf2642f16a9b2e3137d491d708b3b2eb6ef.tar.bz2
apache-c0d81cf2642f16a9b2e3137d491d708b3b2eb6ef.zip
Attempt to fix stop of apache with mod_perl (bug #503986)
-rwxr-xr-x2.4/init/apache2.initd2
1 files changed, 1 insertions, 1 deletions
diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd
index cf3936c..71d4e02 100755
--- a/2.4/init/apache2.initd
+++ b/2.4/init/apache2.initd
@@ -107,7 +107,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