- killproc always returns with process killed (sends -9 as last resort)

- fix chkconfig config tag

Changed files:
    apache.init -> 1.52

diff --git a/apache.init b/apache.init
index ba1026959b2617f45ba8959ade1b9e9d08ab47e5..67d9bc9859b2444f9e99a012a5160f2d5a7a107f 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -7,10 +7,7 @@
 #              HTML files and CGI.
 # processname: httpd
 # pidfile:     /var/run/httpd.pid
-# config:      /etc/httpd/conf/access.conf
-# config:      /etc/httpd/conf/httpd.conf
-# config:      /etc/httpd/conf/srm.conf
-
+# config:      /etc/httpd/apache.conf
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -61,10 +58,7 @@ case "$1" in
        if [ -f /var/lock/subsys/httpd ]; then
                msg_stopping httpd.${HTTPD_MPM}
                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
-               fi
+               rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
        else
                msg_not_running httpd.${HTTPD_MPM}
        fi