remove ap_{post_config,child_init}_hook

replace usage with ap_run_{post_config,child_init}
PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/include/http_config.h b/include/http_config.h
index 1ccc10a5b08180c8831fd9d7f3316b8fbc59d374..929ac44ba20e0866a637dd8d26c3ba8c9d0cc5e5 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -791,16 +791,6 @@ AP_DECLARE(void) ap_show_modules(void);
  */
 AP_DECLARE(server_rec *) ap_read_config(process_rec *process, apr_pool_t *temp_pool, const char *config_name, ap_directive_t **conftree);
 
-/**
- * Run all post config hooks for loaded modules.
- * @param pconf The configuration pool
- * @param plog The logging pool
- * @param ptemp The temporary pool
- * @param s The list of server_rec structures
- * @deffunc void ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
- */
-AP_DECLARE(void) ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s);
-
 /**
  * Run all rewrite args hooks for loaded modules
  * @param process The process currently running the server
@@ -906,15 +896,6 @@ void ap_process_resource_config(server_rec *s, const char *fname,
 AP_DECLARE(void) ap_process_config_tree(server_rec *s, ap_directive_t *conftree,
                                         apr_pool_t *p, apr_pool_t *ptemp);
 
-
-/* For individual MPMs... */
-/**
- * Run all child init hooks
- * @param pchild The pool for child process allocations
- * @param s The list of all server_recs
- */
-void ap_child_init_hook(apr_pool_t *pchild, server_rec *s);
-
 /* Module-method dispatchers, also for http_request.c */
 /**
  * Run the handler phase of each module until a module accepts the

diff --git a/server/config.c b/server/config.c
index d0ec5dd7abf6d49de1e146dd9947a53dc25a2487..2f562a7f5d9d8aadb3afc8b4a8fae0149c55f9b4 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1624,19 +1624,6 @@ AP_DECLARE(void) ap_run_rewrite_args(process_rec *process)
             (*m->rewrite_args) (process);
 }
 
-AP_DECLARE(void) ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
-{
-    ap_run_post_config(pconf,plog,ptemp,s); 
-}
-
-void ap_child_init_hook(apr_pool_t *pchild, server_rec *s)
-{
-    /* TODO: uh this seems ugly, is there a better way? */
-    /*ap_child_init_alloc();    PUT THIS BACK IN XXXXX */
-
-    ap_run_child_init(pchild,s);
-}
-
 /********************************************************************
  * Configuration directives are restricted in terms of where they may
  * appear in the main configuration files and/or .htaccess files according

diff --git a/server/main.c b/server/main.c
index b660599a673e209dc2a7c3ac1082242d215d3271..8f4c2075cc42eba984d12abb539c2366cbf3f421 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -394,7 +394,7 @@ int main(int argc, const char * const argv[])
     }
     apr_pool_clear(plog);
     ap_run_open_logs(pconf, plog, ptemp, server_conf);
-    ap_post_config_hook(pconf, plog, ptemp, server_conf);
+    ap_run_post_config(pconf, plog, ptemp, server_conf);
     apr_pool_destroy(ptemp);
 
     for (;;) {
@@ -420,7 +420,7 @@ int main(int argc, const char * const argv[])
         apr_sort_hooks();
        apr_pool_clear(plog);
        ap_run_open_logs(pconf, plog, ptemp, server_conf);
-       ap_post_config_hook(pconf, plog, ptemp, server_conf);
+       ap_run_post_config(pconf, plog, ptemp, server_conf);
        apr_pool_destroy(ptemp);
 
        ap_run_optional_fn_retrieve();

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 8394598a06ad7f025feacccb359fd9e75f01abc1..cda91239c027b6d5869703753f59b596d16e7dd1 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -739,7 +739,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
      * a seperate pool of it's own to use.
      */
     apr_pool_create(&pchild, pconf);
-    ap_child_init_hook(pchild, ap_server_conf);
+    ap_run_child_init(pchild, ap_server_conf);
 
     /* Now that we have the child pool (pchild) we can allocate
      * the listenfds and creat the pollset...

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 56dfa8d01f4a33d65ac9abde584dd6282155c20e..1dc0ac54f1ab6f961df6f01b25a63e37f0f7e3fb 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -860,7 +860,7 @@ static void child_main(int child_num_arg)
        clean_child_exit(APEXIT_CHILDFATAL);
     }
 
-    ap_child_init_hook(pchild, ap_server_conf);
+    ap_run_child_init(pchild, ap_server_conf);
 
     /*done with init critical section */
 

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index 56dfa8d01f4a33d65ac9abde584dd6282155c20e..1dc0ac54f1ab6f961df6f01b25a63e37f0f7e3fb 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -860,7 +860,7 @@ static void child_main(int child_num_arg)
        clean_child_exit(APEXIT_CHILDFATAL);
     }
 
-    ap_child_init_hook(pchild, ap_server_conf);
+    ap_run_child_init(pchild, ap_server_conf);
 
     /*done with init critical section */
 

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 3631aa355b34ba7c37dccf1950a0667f00963a7a..6b3b5f41af58610afc4653a77b9d2073f0887546 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -550,7 +550,7 @@ static void child_main(int child_num_arg)
        clean_child_exit(APEXIT_CHILDFATAL);
     }
 
-    ap_child_init_hook(pchild, ap_server_conf);
+    ap_run_child_init(pchild, ap_server_conf);
 
     (void) ap_update_child_status(AP_CHILD_THREAD_FROM_ID(my_child_num), SERVER_READY, (request_rec *) NULL);
 

diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 309fb80beb7d434e781df1190a05fca4f43ef694..4ed16a97d20c403863f76903d2ed9fd6647ebf10 100644 (file)
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -527,7 +527,7 @@ static void thread_main(void *thread_num_arg)
     /* needs to be done before we switch UIDs so we have permissions */
     SAFE_ACCEPT(accept_mutex_child_init(pchild));
 
-    ap_child_init_hook(pchild, ap_server_conf);
+    ap_run_child_init(pchild, ap_server_conf);
 
     (void) ap_update_child_status(0, THREAD_GLOBAL(thread_num), SERVER_READY, (request_rec *) NULL);
     

diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index 2d13ff3190a79722a45a933b1e0775b9c340ed8e..174a383294900857fd9bf6b91fa600811b21f1d6 100644 (file)
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -620,7 +620,7 @@ static void child_main(int child_num_arg)
        clean_child_exit(APEXIT_CHILDFATAL);
     }
 
-    ap_child_init_hook(pchild, ap_server_conf);
+    ap_run_child_init(pchild, ap_server_conf);
 
     /*done with init critical section */