Commit 42a75b22 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent 8cdc0a6d

server/mpm/event/event.c

+0 −1
Changes for server/mpm/event/event.c: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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) {

server/mpm/prefork/prefork.c

+0 −2
Changes for server/mpm/prefork/prefork.c: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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);

server/mpm/worker/worker.c

+0 −2
Changes for server/mpm/worker/worker.c: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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);