From: Manoj Kasichainula <manoj@apache.org>
Date: Tue, 27 Jul 1999 23:54:24 +0000 (+0000)
Subject: Update with latest hook additions.
X-Git-Tag: 1.3.7~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fd6c036d6c36b810ca96298479d660446d834ec;p=thirdparty%2Fapache%2Fhttpd.git

Update with latest hook additions.


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

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index a9077d32172..65d0452e8fb 100644
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -1443,12 +1443,6 @@ int ap_mpm_run(pool *_pconf, pool *plog, server_rec *s)
     return 0;
 }
 
-static void dexter_hooks(void)
-{
-    INIT_SIGLIST()
-    one_process = 0;
-}
-
 static void dexter_pre_config(pool *pconf, pool *plog, pool *ptemp)
 {
     static int restart_num = 0;
@@ -1480,6 +1474,12 @@ static void dexter_pre_config(pool *pconf, pool *plog, pool *ptemp)
     ap_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
 }
 
+static void dexter_hooks(void)
+{
+    ap_hook_pre_config(dexter_pre_config, NULL, NULL, HOOK_MIDDLE);
+    INIT_SIGLIST()
+    one_process = 0;
+}
 
 static const char *set_pidfile(cmd_parms *cmd, void *dummy, char *arg) 
 {
@@ -1691,7 +1691,6 @@ LISTEN_COMMANDS
 
 module MODULE_VAR_EXPORT mpm_dexter_module = {
     STANDARD20_MODULE_STUFF,
-    dexter_pre_config,		/* pre_config */
     NULL,                       /* post_config */
     NULL,			/* open_logs */
     NULL, 			/* child_init */
diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 50b47215a19..0d4be5819d9 100644
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -1510,12 +1510,6 @@ int ap_mpm_run(pool *_pconf, pool *plog, server_rec *s)
     return 0;
 }
 
-static void mpmt_pthread_hooks(void)
-{
-    INIT_SIGLIST()
-    one_process = 0;
-}
-
 static void mpmt_pthread_pre_config(pool *pconf, pool *plog, pool *ptemp)
 {
     static int restart_num = 0;
@@ -1549,6 +1543,13 @@ static void mpmt_pthread_pre_config(pool *pconf, pool *plog, pool *ptemp)
     ap_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
 }
 
+static void mpmt_pthread_hooks(void)
+{
+    ap_hook_pre_config(mpmt_pthread_pre_config,NULL,NULL,HOOK_MIDDLE);
+    INIT_SIGLIST()
+    one_process = 0;
+}
+
 
 static const char *set_pidfile(cmd_parms *cmd, void *dummy, char *arg) 
 {
@@ -1764,7 +1765,6 @@ LISTEN_COMMANDS
 
 module MODULE_VAR_EXPORT mpm_mpmt_pthread_module = {
     STANDARD20_MODULE_STUFF,
-    mpmt_pthread_pre_config,		/* pre_config */
     NULL,                       /* post_config */
     NULL,			/* open_logs */
     NULL, 			/* child_init */