httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1078285 - in /httpd/httpd/trunk/server/mpm: event/event.c prefork/prefork.c worker/worker.c
Date Sat, 05 Mar 2011 13:09:12 GMT
Author: trawick
Date: Sat Mar  5 13:09:12 2011
New Revision: 1078285

URL: http://svn.apache.org/viewvc?rev=1078285&view=rev
Log:
zap needless reinitialization of is_graceful on the 2nd
call of the open-logs hook

Modified:
    httpd/httpd/trunk/server/mpm/event/event.c
    httpd/httpd/trunk/server/mpm/prefork/prefork.c
    httpd/httpd/trunk/server/mpm/worker/worker.c

Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1078285&r1=1078284&r2=1078285&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Sat Mar  5 13:09:12 2011
@@ -2442,7 +2442,6 @@ static int event_pre_config(apr_pool_t *
     }
     ++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) {

Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=1078285&r1=1078284&r2=1078285&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Sat Mar  5 13:09:12 2011
@@ -1270,8 +1270,6 @@ static int prefork_pre_config(apr_pool_t
     }
     ++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);

Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=1078285&r1=1078284&r2=1078285&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Sat Mar  5 13:09:12 2011
@@ -1960,8 +1960,6 @@ static int worker_pre_config(apr_pool_t 
     }
     ++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);



Mime
View raw message