- up to 2.0.63 (fixes CVE-2007-6388, CVE-2007-5000)

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index f5e09b930ed196b9eef4a7303d2fa6e0897d902e..fe83adda65bbb608999d4281d0bc6be8ca9c6350 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -19,7 +19,7 @@
 . /etc/sysconfig/network
 
 # Get service config
-[ -f /etc/sysconfig/apache ] && . /etc/sysconfig/apache
+[ -f /etc/sysconfig/httpd ] && . /etc/sysconfig/httpd
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
@@ -33,13 +33,13 @@ else
 fi
 
 [ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
-if   [ -d "${HTTPD_CONF:-'/etc/httpd/httpd.conf'}" ]; then
+if [ -d "${HTTPD_CONF:-'/etc/httpd/httpd.conf'}" ]; then
        CFG="-f ${HTTPD_CONF:-'/etc/httpd/httpd.conf'}"
 elif [ -n "$HTTPD_CONF" ]; then
        echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
        exit 1
 else
-       CFG=""
+       CFG=""
 fi
 
 RETVAL=0
@@ -60,10 +60,10 @@ case "$1" in
        # Stop daemons.
        if [ -f /var/lock/subsys/httpd ]; then
                msg_stopping httpd.${HTTPD_MPM}
-               daemon --waitforname httpd.${HTTPD_MPM} --waitfortime 60 httpd.${HTTPD_MPM} $CFG -k stop
-               RET=$?
+               [ -n "$(pidofproc httpd.${HTTPD_MPM})" ] && OPT="--waitforname httpd.${HTTPD_MPM} --waitfortime 60" || OPT=
+               daemon $OPT httpd.${HTTPD_MPM} $CFG -k stop
                # Delete pidfile only when apache was called successfully
-               if [ $RET -eq 0 ]; then
+               if [ $? -eq 0 ]; then
                        rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
                fi
        else
@@ -76,20 +76,18 @@ case "$1" in
        /usr/sbin/httpd.${HTTPD_MPM} $CFG -S
        ;;
   restart)
-       $0 stop
+       $0 stop
        $0 start
        ;;
   reload|force-reload|graceful)
        if [ -f /var/lock/subsys/httpd ]; then
-               msg_reloading httpd.${HTTPD_MPM}
-               httpd.${HTTPD_MPM} $CFG -t > /dev/null 2>&1
-               if [ $? -eq 0 ]; then
-                   daemon httpd.${HTTPD_MPM} $CFG -k graceful
-               else
-                   fail
-                   echo "Configuration file syntax test failed."
-               fi
+               run_cmd "Checking httpd.${HTTPD_MPM} configuration" httpd.${HTTPD_MPM} $CFG -t
                RETVAL=$?
+               if [ $RETVAL -eq 0 ]; then
+                       msg_reloading httpd.${HTTPD_MPM}
+                       daemon httpd.${HTTPD_MPM} $CFG -k graceful
+                       RETVAL=$?
+               fi
        else
                msg_not_running httpd.${HTTPD_MPM} >&2
                RETVAL=7