- new from 2.2 branch

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index 0ca66211ac8734f1c2bb485c906e00b9921a13d9..ba1026959b2617f45ba8959ade1b9e9d08ab47e5 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -60,8 +60,7 @@ case "$1" in
        # Stop daemons.
        if [ -f /var/lock/subsys/httpd ]; then
                msg_stopping httpd.${HTTPD_MPM}
-               [ -n "$(pidofproc httpd.${HTTPD_MPM})" ] && OPT="--waitforname httpd.${HTTPD_MPM} --waitfortime 60" || OPT=
-               daemon $OPT httpd.${HTTPD_MPM} $CFG -k stop
+               killproc --pidfile httpd.pid httpd.${HTTPD_MPM}
                # Delete pidfile only when apache was called successfully
                if [ $? -eq 0 ]; then
                        rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1