zap needless reinitialization of is_graceful on the 2nd

call of the open-logs hook

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1078285 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 21d0d16b7c6e48e7b99725c6e8d192c16c3058eb..a66027a8fa9f733a6df6312fe3ef7a6d4999220e 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -2442,7 +2442,6 @@ static int event_pre_config(apr_pool_t * pconf, apr_pool_t * plog,
     }
     ++retained->module_loads;
     if (retained->module_loads == 2) {
-        is_graceful = 0;
         rv = apr_pollset_create(&event_pollset, 1, plog,
                                 APR_POLLSET_THREADSAFE | APR_POLLSET_NOCOPY);
         if (rv != APR_SUCCESS) {

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index ebc36c6ccbb868a1efc480cba9880d01ca156934..bf7a5faaa7cabee9c2eb0519ec8e7372dbba3a52 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1270,8 +1270,6 @@ static int prefork_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp
     }
     ++retained->module_loads;
     if (retained->module_loads == 2) {
-        is_graceful = 0;
-
         if (!one_process && !foreground) {
             rv = apr_proc_detach(no_detach ? APR_PROC_DETACH_FOREGROUND
                                            : APR_PROC_DETACH_DAEMONIZE);

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 299ed1d763ab5c825af171be88145a678e00fc26..58067da83e1dfeac8debf0819f56469fcad7ba53 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1960,8 +1960,6 @@ static int worker_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
     }
     ++retained->module_loads;
     if (retained->module_loads == 2) {
-        is_graceful = 0;
-
         if (!one_process && !foreground) {
             rv = apr_proc_detach(no_detach ? APR_PROC_DETACH_FOREGROUND
                                            : APR_PROC_DETACH_DAEMONIZE);