Author: glen Date: Wed Dec 21 22:20:37 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- use killproc to shutdown apache, otherwise you'll find yourself in situation
where you can't stop apache (clean way) because your apache config is broken
due missing apache module api deps and not all modules are rebuilt on
builders, and you can't install new package updates because upgrade fails
because apache reload fails because the config is missing.
see also http://issues.apache.org/bugzilla/show_bug.cgi?id=37966
---- Files affected:
SOURCES:
apache.init (1.48 -> 1.49)
---- Diffs:
================================================================
Index: SOURCES/apache.init
diff -u SOURCES/apache.init:1.48 SOURCES/apache.init:1.49
--- SOURCES/apache.init:1.48 Wed Dec 14 22:20:25 2005
+++ SOURCES/apache.init Wed Dec 21 23:20:31 2005
@@ -61,7 +61,7 @@
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 /var/run/httpd.pid $OPT 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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/apache.init?r1=1.48&r2=1.49&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
