ben 99/08/14 17:11:23
Modified: mpm/src/include http_config.h
mpm/src/main http_config.c http_core.c
mpm/src/modules/mpm/prefork prefork.c
mpm/src/modules/standard mod_access.c mod_actions.c
mod_alias.c mod_asis.c mod_auth.c mod_autoindex.c
mod_dir.c mod_echo.c mod_env.c mod_imap.c
mod_log_config.c mod_mime.c mod_negotiation.c
mod_setenvif.c mod_userdir.c
Log:
Child initializer hook.
Revision Changes Path
1.17 +1 -2 apache-2.0/mpm/src/include/http_config.h
Index: http_config.h
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/include/http_config.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- http_config.h 1999/08/15 00:01:15 1.16
+++ http_config.h 1999/08/15 00:11:11 1.17
@@ -211,8 +211,6 @@
* (see also mod_so).
*/
- void (*child_init)(pool *pchild, server_rec *);
-
void *(*create_dir_config) (pool *p, char *dir);
void *(*merge_dir_config) (pool *p, void *base_conf, void *new_conf);
void *(*create_server_config) (pool *p, server_rec *s);
@@ -373,6 +371,7 @@
(pool *pconf,pool *plog,pool *ptemp,server_rec *s))
DECLARE_HOOK(void,open_logs,
(pool *pconf,pool *plog,pool *ptemp,server_rec *s))
+DECLARE_HOOK(void,child_init,(pool *pchild, server_rec *s))
#ifdef __cplusplus
}
1.22 +3 -5 apache-2.0/mpm/src/main/http_config.c
Index: http_config.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_config.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- http_config.c 1999/08/15 00:03:53 1.21
+++ http_config.c 1999/08/15 00:11:11 1.22
@@ -86,6 +86,7 @@
HOOK_LINK(pre_config)
HOOK_LINK(post_config)
HOOK_LINK(open_logs)
+ HOOK_LINK(child_init)
)
IMPLEMENT_HOOK_RUN_ALL(int,header_parser,(request_rec *r),(r),OK,DECLINED)
@@ -97,6 +98,7 @@
IMPLEMENT_HOOK_VOID(open_logs,
(pool *pconf, pool *plog, pool *ptemp, server_rec *s),
(pconf,plog,ptemp,s))
+IMPLEMENT_HOOK_VOID(child_init,(pool *pchild, server_rec *s),(pchild,s))
DEF_Explain
@@ -1312,14 +1314,10 @@
void ap_child_init_hook(pool *pchild, server_rec *s)
{
- module *m;
-
/* TODO: uh this seems ugly, is there a better way? */
ap_child_init_alloc();
- for (m = top_module; m; m = m->next)
- if (m->child_init)
- (*m->child_init) (pchild, s);
+ ap_run_child_init(pchild,s);
}
/********************************************************************
1.20 +0 -1 apache-2.0/mpm/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_core.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- http_core.c 1999/08/15 00:01:18 1.19
+++ http_core.c 1999/08/15 00:11:12 1.20
@@ -2675,7 +2675,6 @@
API_VAR_EXPORT module core_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* child_init */
create_core_dir_config, /* create per-directory config structure */
merge_core_dir_configs, /* merge per-directory config structures */
create_core_server_config, /* create per-server config structure */
1.30 +0 -1 apache-2.0/mpm/src/modules/mpm/prefork/prefork.c
Index: prefork.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- prefork.c 1999/08/15 00:01:23 1.29
+++ prefork.c 1999/08/15 00:11:13 1.30
@@ -2977,7 +2977,6 @@
module MODULE_VAR_EXPORT mpm_prefork_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* child_init */
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
NULL, /* create per-server config structure */
1.15 +0 -1 apache-2.0/mpm/src/modules/standard/mod_access.c
Index: mod_access.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_access.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_access.c 1999/08/15 00:01:24 1.14
+++ mod_access.c 1999/08/15 00:11:14 1.15
@@ -392,7 +392,6 @@
module MODULE_VAR_EXPORT access_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* initializer */
create_access_dir_config, /* dir config creater */
NULL, /* dir merger --- default is to override */
NULL, /* server config */
1.14 +0 -1 apache-2.0/mpm/src/modules/standard/mod_actions.c
Index: mod_actions.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_actions.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_actions.c 1999/08/15 00:01:24 1.13
+++ mod_actions.c 1999/08/15 00:11:14 1.14
@@ -211,7 +211,6 @@
module action_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* child initializer */
create_action_dir_config, /* dir config creater */
merge_action_dir_configs, /* dir merger --- default is to
override */
NULL, /* server config */
1.16 +0 -1 apache-2.0/mpm/src/modules/standard/mod_alias.c
Index: mod_alias.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_alias.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_alias.c 1999/08/15 00:01:24 1.15
+++ mod_alias.c 1999/08/15 00:11:15 1.16
@@ -406,7 +406,6 @@
module MODULE_VAR_EXPORT alias_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* initializer */
create_alias_dir_config, /* dir config creater */
merge_alias_dir_config, /* dir merger --- default is to override */
create_alias_config, /* server config */
1.15 +0 -1 apache-2.0/mpm/src/modules/standard/mod_asis.c
Index: mod_asis.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_asis.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_asis.c 1999/08/15 00:01:24 1.14
+++ mod_asis.c 1999/08/15 00:11:18 1.15
@@ -126,7 +126,6 @@
module MODULE_VAR_EXPORT asis_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* child initaliser */
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
NULL, /* create per-server config structure */
1.16 +0 -1 apache-2.0/mpm/src/modules/standard/mod_auth.c
Index: mod_auth.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_auth.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_auth.c 1999/08/15 00:01:24 1.15
+++ mod_auth.c 1999/08/15 00:11:18 1.16
@@ -318,7 +318,6 @@
module MODULE_VAR_EXPORT auth_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* initializer */
create_auth_dir_config, /* dir config creater */
NULL, /* dir merger --- default is to override */
NULL, /* server config */
1.15 +0 -1 apache-2.0/mpm/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===================================================================
RCS file:
/export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_autoindex.c 1999/08/15 00:01:25 1.14
+++ mod_autoindex.c 1999/08/15 00:11:18 1.15
@@ -1650,7 +1650,6 @@
module MODULE_VAR_EXPORT autoindex_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* child initializer */
create_autoindex_config, /* dir config creater */
merge_autoindex_configs, /* dir merger --- default is to override */
NULL, /* server config */
1.14 +0 -1 apache-2.0/mpm/src/modules/standard/mod_dir.c
Index: mod_dir.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_dir.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_dir.c 1999/08/15 00:01:25 1.13
+++ mod_dir.c 1999/08/15 00:11:18 1.14
@@ -224,7 +224,6 @@
module MODULE_VAR_EXPORT dir_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* child_init */
create_dir_config, /* create per-directory config
structure */
merge_dir_configs, /* merge per-directory config
structures */
NULL, /* create per-server config structure */
1.9 +0 -1 apache-2.0/mpm/src/modules/standard/mod_echo.c
Index: mod_echo.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_echo.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_echo.c 1999/08/15 00:01:25 1.8
+++ mod_echo.c 1999/08/15 00:11:18 1.9
@@ -63,7 +63,6 @@
API_VAR_EXPORT module echo_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* child_init */
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
create_echo_server_config, /* create per-server config structure */
1.16 +0 -1 apache-2.0/mpm/src/modules/standard/mod_env.c
Index: mod_env.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_env.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_env.c 1999/08/15 00:01:25 1.15
+++ mod_env.c 1999/08/15 00:11:18 1.16
@@ -256,7 +256,6 @@
module MODULE_VAR_EXPORT env_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* child initializer */
create_env_dir_config, /* dir config creater */
merge_env_dir_configs, /* dir merger --- default is to override */
NULL, /* server config */
1.15 +0 -1 apache-2.0/mpm/src/modules/standard/mod_imap.c
Index: mod_imap.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_imap.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_imap.c 1999/08/15 00:01:25 1.14
+++ mod_imap.c 1999/08/15 00:11:19 1.15
@@ -897,7 +897,6 @@
module MODULE_VAR_EXPORT imap_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* child initializer */
create_imap_dir_config, /* dir config creater */
merge_imap_dir_configs, /* dir merger --- default is to override */
NULL, /* server config */
1.16 +0 -1 apache-2.0/mpm/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===================================================================
RCS file:
/export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_log_config.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_log_config.c 1999/08/15 00:01:26 1.15
+++ mod_log_config.c 1999/08/15 00:11:19 1.16
@@ -1123,7 +1123,6 @@
module MODULE_VAR_EXPORT config_log_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* child_init */
NULL, /* create per-dir config */
NULL, /* merge per-dir config */
make_config_log_state, /* server config */
1.14 +0 -1 apache-2.0/mpm/src/modules/standard/mod_mime.c
Index: mod_mime.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_mime.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_mime.c 1999/08/15 00:01:26 1.13
+++ mod_mime.c 1999/08/15 00:11:19 1.14
@@ -387,7 +387,6 @@
module MODULE_VAR_EXPORT mime_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* child_init */
create_mime_dir_config, /* create per-directory config structure */
merge_mime_dir_configs, /* merge per-directory config structures */
NULL, /* create per-server config structure */
1.15 +0 -1 apache-2.0/mpm/src/modules/standard/mod_negotiation.c
Index: mod_negotiation.c
===================================================================
RCS file:
/export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_negotiation.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_negotiation.c 1999/08/15 00:01:26 1.14
+++ mod_negotiation.c 1999/08/15 00:11:19 1.15
@@ -2733,7 +2733,6 @@
module MODULE_VAR_EXPORT negotiation_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* initializer */
create_neg_dir_config, /* dir config creator */
merge_neg_dir_configs, /* dir merger --- default is to override */
NULL, /* server config */
1.16 +0 -1 apache-2.0/mpm/src/modules/standard/mod_setenvif.c
Index: mod_setenvif.c
===================================================================
RCS file:
/export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_setenvif.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_setenvif.c 1999/08/15 00:01:26 1.15
+++ mod_setenvif.c 1999/08/15 00:11:20 1.16
@@ -408,7 +408,6 @@
module MODULE_VAR_EXPORT setenvif_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* initializer */
NULL, /* dir config creater */
NULL, /* dir merger --- default is to override */
create_setenvif_config, /* server config */
1.16 +0 -1 apache-2.0/mpm/src/modules/standard/mod_userdir.c
Index: mod_userdir.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/standard/mod_userdir.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_userdir.c 1999/08/15 00:01:26 1.15
+++ mod_userdir.c 1999/08/15 00:11:20 1.16
@@ -336,7 +336,6 @@
module userdir_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* child initializer */
NULL, /* dir config creater */
NULL, /* dir merger --- default is to override */
create_userdir_config, /* server config */
