Another hook (I won't be upset if someone else wants to do some!).

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

diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c
index a4f2b3f41988cf5fd8c2bf542cc42731011667f7..0ca37a0a1eee9a7b98c0f47cf1735c61d0798593 100644 (file)
--- a/modules/echo/mod_echo.c
+++ b/modules/echo/mod_echo.c
@@ -63,7 +63,6 @@ static void register_hooks()
 
 API_VAR_EXPORT module echo_module = {
     STANDARD20_MODULE_STUFF,
-    NULL,                      /* pre_config */
     NULL,                      /* post_config */
     NULL,                      /* open_logs */
     NULL,                      /* child_init */

diff --git a/server/connection.c b/server/connection.c
index c4cff197125daae29acfb7fe2d2ecfcc2666ca7a..00ea8ab91f68cf4977d7052e4a1677191d703a6a 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -69,7 +69,7 @@ HOOK_STRUCT(
            HOOK_LINK(process_connection)
 );
 
-IMPLEMENT_VOID_HOOK(pre_connection,(conn_rec *c),(c),RUN_ALL)
+IMPLEMENT_VOID_HOOK(pre_connection,(conn_rec *c),(c))
 IMPLEMENT_HOOK(int,process_connection,(conn_rec *c),(c),RUN_FIRST,OK,DECLINED)
 
 /* TODO: re-implement the lingering close stuff */

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index ea921a9d9dac1bf29680867a36257ffa85f50c37..371352da99458ec8173c41847b97519359690ed6 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -2859,15 +2859,6 @@ int ap_mpm_run(pool *_pconf, pool *plog, server_rec *s)
     return 0;
 }
 
-static void prefork_hooks(void)
-{
-    INIT_SIGLIST();
-#ifdef AUX3
-    (void) set42sig();
-#endif
-    /* TODO: set one_process properly */ one_process = 0;
-}
-
 static void prefork_pre_config(pool *pconf, pool *plog, pool *ptemp)
 {
     static int restart_num = 0;
@@ -2900,6 +2891,16 @@ static void prefork_pre_config(pool *pconf, pool *plog, pool *ptemp)
     ap_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
 }
 
+static void prefork_hooks(void)
+{
+    ap_hook_pre_config(prefork_pre_config,NULL,NULL,HOOK_MIDDLE);
+    INIT_SIGLIST();
+#ifdef AUX3
+    (void) set42sig();
+#endif
+    /* TODO: set one_process properly */ one_process = 0;
+}
+
 static const char *set_pidfile(cmd_parms *cmd, void *dummy, char *arg) 
 {
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -3083,7 +3084,6 @@ LISTEN_COMMANDS
 
 module MODULE_VAR_EXPORT mpm_prefork_module = {
     STANDARD20_MODULE_STUFF,
-    prefork_pre_config,                /* pre_config */
     NULL,                      /* post_config */
     NULL,                      /* open_logs */
     NULL,                      /* child_init */