httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chr...@apache.org
Subject svn commit: r464973 - /httpd/httpd/trunk/server/mpm/experimental/event/event.c
Date Tue, 17 Oct 2006 17:39:53 GMT
Author: chrisd
Date: Tue Oct 17 10:39:52 2006
New Revision: 464973

URL: http://svn.apache.org/viewvc?view=rev&rev=464973
Log:
rename routines from worker MPM to match normal MPM naming

Modified:
    httpd/httpd/trunk/server/mpm/experimental/event/event.c

Modified: httpd/httpd/trunk/server/mpm/experimental/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/experimental/event/event.c?view=diff&rev=464973&r1=464972&r2=464973
==============================================================================
--- httpd/httpd/trunk/server/mpm/experimental/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/experimental/event/event.c Tue Oct 17 10:39:52 2006
@@ -216,7 +216,7 @@
 
 server_rec *ap_server_conf;
 
-/* The worker MPM respects a couple of runtime flags that can aid
+/* The event MPM respects a couple of runtime flags that can aid
  * in debugging. Setting the -DNO_DETACH flag will prevent the root process
  * from detaching from its controlling terminal. Additionally, setting
  * the -DONE_PROCESS flag (which implies -DNO_DETACH) will get you the
@@ -2130,8 +2130,8 @@
 /* This really should be a post_config hook, but the error log is already
  * redirected by that point, so we need to do this in the open_logs phase.
  */
-static int worker_open_logs(apr_pool_t * p, apr_pool_t * plog,
-                            apr_pool_t * ptemp, server_rec * s)
+static int event_open_logs(apr_pool_t * p, apr_pool_t * plog,
+                           apr_pool_t * ptemp, server_rec * s)
 {
     static int restart_num = 0;
     int startup = 0;
@@ -2165,8 +2165,8 @@
     return OK;
 }
 
-static int worker_pre_config(apr_pool_t * pconf, apr_pool_t * plog,
-                             apr_pool_t * ptemp)
+static int event_pre_config(apr_pool_t * pconf, apr_pool_t * plog,
+                            apr_pool_t * ptemp)
 {
     static int restart_num = 0;
     int no_detach, debug, foreground;
@@ -2480,11 +2480,11 @@
     static const char *const aszSucc[] = { "core.c", NULL };
     one_process = 0;
 
-    ap_hook_open_logs(worker_open_logs, NULL, aszSucc, APR_HOOK_REALLY_FIRST);
+    ap_hook_open_logs(event_open_logs, NULL, aszSucc, APR_HOOK_REALLY_FIRST);
     /* we need to set the MPM state before other pre-config hooks use MPM query
      * to retrieve it, so register as REALLY_FIRST
      */
-    ap_hook_pre_config(worker_pre_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
+    ap_hook_pre_config(event_pre_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
     ap_hook_check_config(event_check_config, NULL, NULL, APR_HOOK_MIDDLE);
 }
 



Mime
View raw message