ServerTokens Full->Prod to hide specific Apache/Modules version information in both...

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index 9b4662ee16ffc3dbc0cea91785cf49ca64ce52fe..692c2375734ae6ab3857d77023f611a3f821b6d2 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -81,8 +81,11 @@ start() {
                return
        fi
 
-       checkconfig
+       [ "$1" -eq 0 ] || checkconfig
        msg_starting "$SVC_NAME"
+       # remove ssl_scache on startup, otherwise httpd may go into
+       # infinite loop if there are db transaction logs laying around
+       rm -f /var/cache/httpd/*ssl_scache*
        daemon --pidfile /var/run/httpd.pid /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
@@ -138,8 +141,9 @@ case "$1" in
        stop
        ;;
   restart)
+       checkconfig
        stop
-       start
+       start 0
        ;;
   try-restart)
        condrestart 0