From 21a628f138a89cfa7b360315dad3b7054cb99be4 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Sat, 5 Mar 2011 13:09:12 +0000 Subject: [PATCH] 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 --- server/mpm/event/event.c | 1 - server/mpm/prefork/prefork.c | 2 -- server/mpm/worker/worker.c | 2 -- 3 files changed, 5 deletions(-) diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index 21d0d16b7c..a66027a8fa 100644 --- 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 ebc36c6ccb..bf7a5faaa7 100644 --- 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 299ed1d763..58067da83e 100644 --- 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); -- 2.40.0