diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-05-14 15:56:32 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-05-14 15:56:32 +0200 |
| commit | 75da24d75d5fd2f10fc0c3dcfda5beb6c948fda1 (patch) | |
| tree | de1b03f9bafbc1a96d31f6202f2302dd5c21f66b /2.2 | |
| parent | Attempt to fix stop of apache with mod_perl (bug #503986) (diff) | |
| download | apache-75da24d75d5fd2f10fc0c3dcfda5beb6c948fda1.tar.gz apache-75da24d75d5fd2f10fc0c3dcfda5beb6c948fda1.tar.bz2 apache-75da24d75d5fd2f10fc0c3dcfda5beb6c948fda1.zip | |
Attempt to fix stop of apache with mod_perl in apache-2.2 as well (bug #503986)
Diffstat (limited to '2.2')
| -rwxr-xr-x | 2.2/init/apache2.initd | 2 |
1 files changed, 1 insertions, 1 deletions
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 |