SOURCES: apache.init - killproc always returns with process killed...

[glen]

Author: glen                         Date: Thu Dec 22 18:46:08 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- killproc always returns with process killed (sends -9 as last resort)
- fix chkconfig config tag

---- Files affected:
SOURCES:
   apache.init (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: SOURCES/apache.init
diff -u SOURCES/apache.init:1.51 SOURCES/apache.init:1.52
--- SOURCES/apache.init:1.51	Thu Dec 22 00:04:22 2005
+++ SOURCES/apache.init	Thu Dec 22 19:46:02 2005
@@ -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 @@
 	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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache.init?r1=1.51&r2=1.52&f=u