From: Doug MacEachern Date: Fri, 23 Feb 2001 18:17:19 +0000 (+0000) Subject: remove ap_{post_config,child_init}_hook X-Git-Tag: 2.0.12~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24e2ea6b10ffc502cebc79107e9bcb9bcd661392;p=thirdparty%2Fapache%2Fhttpd.git 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 1ccc10a5b08..929ac44ba20 100644 --- 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 d0ec5dd7abf..2f562a7f5d9 100644 --- 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 b660599a673..8f4c2075cc4 100644 --- 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 8394598a06a..cda91239c02 100644 --- 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 56dfa8d01f4..1dc0ac54f1a 100644 --- 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 56dfa8d01f4..1dc0ac54f1a 100644 --- 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 3631aa355b3..6b3b5f41af5 100644 --- 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 309fb80beb7..4ed16a97d20 100644 --- 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 2d13ff3190a..174a3832949 100644 --- 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 */