Merge branch 'feat/restart-delay-parameter'

diff --git a/apache.init b/apache.init
old mode 100644 (file)
new mode 100755 (executable)
index 8ce5a86..00dd2f4
--- a/apache.init
+++ b/apache.init
@@ -127,6 +127,7 @@ condrestart() {
 
        checkconfig
        stop
+       [ "$RESTART_DELAY" ] && usleep $RESTART_DELAY
        start
 }
 
@@ -142,6 +143,7 @@ case "$1" in
   restart)
        checkconfig
        stop
+       [ "$RESTART_DELAY" ] && usleep $RESTART_DELAY
        start 0
        ;;
   try-restart)

diff --git a/apache.spec b/apache.spec
index c9b01296a07d08f074786911cbaadda05da17d6c..a1c7b4655f5b3a54fa61e1ad6d1417287d415df6 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8):    Самый популярный веб-сервер
 Summary(tr.UTF-8):     Lider WWW tarayıcı
 Name:          apache
 Version:       2.4.10
-Release:       2
+Release:       3
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2

diff --git a/apache.sysconfig b/apache.sysconfig
index c76349c09e40a262cdc991d8ed4c10f9e43f6bdc..bc192b8b1500125d42d3e3c838841f4269278a57 100644 (file)
--- a/apache.sysconfig
+++ b/apache.sysconfig
@@ -1,5 +1,4 @@
 # Customized settings for Apache
-# $Id$
 
 # Nice level for apache
 SERVICE_RUN_NICE_LEVEL="+5"
@@ -16,3 +15,6 @@ HTTPD_OPTS=""
 
 # Skip apache restarts invoked from rpm installs.
 #RPM_SKIP_AUTO_RESTART=yes
+
+# Delay in microseconds between stop and start to mitigate problems of third party Apache modules (PHP session ext
+#RESTART_DELAY=50000