both of these functions simply passthru to ap_run_post_config and
ap_run_child_init, any reason not to remove them? things work fine
without..
Index: include/http_config.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/http_config.h,v
retrieving revision 1.68
diff -u -r1.68 http_config.h
--- include/http_config.h 2001/02/22 08:17:41 1.68
+++ include/http_config.h 2001/02/23 05:29:31
@@ -792,16 +792,6 @@
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
* @deffunc void ap_run_rewrite_args(process_rec *process)
@@ -905,15 +895,6 @@
*/
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 */
/**
Index: server/config.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/config.c,v
retrieving revision 1.115
diff -u -r1.115 config.c
--- server/config.c 2001/02/22 08:15:48 1.115
+++ server/config.c 2001/02/23 05:29:53
@@ -1624,19 +1624,6 @@
(*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
Index: server/main.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/main.c,v
retrieving revision 1.94
diff -u -r1.94 main.c
--- server/main.c 2001/02/21 13:35:34 1.94
+++ server/main.c 2001/02/23 05:29:54
@@ -394,7 +394,7 @@
}
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 @@
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();
Index: server/mpm/beos/beos.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v
retrieving revision 1.45
diff -u -r1.45 beos.c
--- server/mpm/beos/beos.c 2001/02/19 02:06:57 1.45
+++ server/mpm/beos/beos.c 2001/02/23 05:29:57
@@ -739,7 +739,7 @@
* 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...
Index: server/mpm/perchild/perchild.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v
retrieving revision 1.51
diff -u -r1.51 perchild.c
--- server/mpm/perchild/perchild.c 2001/02/23 03:19:29 1.51
+++ server/mpm/perchild/perchild.c 2001/02/23 05:30:01
@@ -860,7 +860,7 @@
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 */
Index: server/mpm/prefork/prefork.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
retrieving revision 1.167
diff -u -r1.167 prefork.c
--- server/mpm/prefork/prefork.c 2001/02/19 02:06:58 1.167
+++ server/mpm/prefork/prefork.c 2001/02/23 05:30:05
@@ -550,7 +550,7 @@
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);
Index: server/mpm/spmt_os2/spmt_os2.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/spmt_os2/spmt_os2.c,v
retrieving revision 1.87
diff -u -r1.87 spmt_os2.c
--- server/mpm/spmt_os2/spmt_os2.c 2001/02/19 02:06:58 1.87
+++ server/mpm/spmt_os2/spmt_os2.c 2001/02/23 05:30:08
@@ -527,7 +527,7 @@
/* 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);
Index: server/mpm/threaded/threaded.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/threaded.c,v
retrieving revision 1.7
diff -u -r1.7 threaded.c
--- server/mpm/threaded/threaded.c 2001/02/22 21:35:38 1.7
+++ server/mpm/threaded/threaded.c 2001/02/23 05:30:11
@@ -620,7 +620,7 @@
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 */
