ben 99/08/01 07:43:32
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:
Another hook.
Revision Changes Path
1.14 +3 -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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- http_config.h 1999/08/01 14:12:29 1.13
+++ http_config.h 1999/08/01 14:43:22 1.14
@@ -211,7 +211,6 @@
* (see also mod_so).
*/
- void (*post_config)(pool *pconf, pool *plog, pool *ptemp, server_rec *);
void (*child_init)(pool *pchild, server_rec *);
void *(*create_dir_config) (pool *p, char *dir);
@@ -374,8 +373,10 @@
/* Hooks */
DECLARE_HOOK(int,header_parser,(request_rec *))
DECLARE_HOOK(void,pre_config,(pool *pconf,pool *plog,pool *ptemp))
+DECLARE_HOOK(void,post_config,
+ (pool *pconf,pool *plog,pool *ptemp,server_rec *s))
DECLARE_HOOK(void,open_logs,
- (pool *pconf, pool *plog, pool *ptemp, server_rec *s))
+ (pool *pconf,pool *plog,pool *ptemp,server_rec *s))
#ifdef __cplusplus
}
1.18 +5 -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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- http_config.c 1999/08/01 14:12:30 1.17
+++ http_config.c 1999/08/01 14:43:23 1.18
@@ -84,12 +84,16 @@
HOOK_STRUCT(
HOOK_LINK(header_parser)
HOOK_LINK(pre_config)
+ HOOK_LINK(post_config)
HOOK_LINK(open_logs)
)
IMPLEMENT_HOOK_RUN_ALL(int,header_parser,(request_rec *r),(r),OK,DECLINED)
IMPLEMENT_HOOK_VOID(pre_config,(pool *pconf,pool *plog,pool *ptemp),
(pconf,plog,ptemp))
+IMPLEMENT_HOOK_VOID(post_config,
+ (pool *pconf, pool *plog, pool *ptemp, server_rec *s),
+ (pconf,plog,ptemp,s))
IMPLEMENT_HOOK_VOID(open_logs,
(pool *pconf, pool *plog, pool *ptemp, server_rec *s),
(pconf,plog,ptemp,s))
@@ -1446,11 +1450,7 @@
void ap_post_config_hook(pool *pconf, pool *plog, pool *ptemp, server_rec *s)
{
- module *m;
-
- for (m = top_module; m; m = m->next)
- if (m->post_config)
- (*m->post_config) (pconf, plog, ptemp, s);
+ ap_run_post_config(pconf,plog,ptemp,s);
build_method_shortcuts();
init_handlers(pconf);
}
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- http_core.c 1999/08/01 14:12:30 1.14
+++ http_core.c 1999/08/01 14:43:23 1.15
@@ -2650,7 +2650,6 @@
API_VAR_EXPORT module core_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* child_init */
create_core_dir_config, /* create per-directory config structure */
merge_core_dir_configs, /* merge per-directory config structures */
1.23 +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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- prefork.c 1999/08/01 14:12:31 1.22
+++ prefork.c 1999/08/01 14:43:24 1.23
@@ -3084,7 +3084,6 @@
module MODULE_VAR_EXPORT mpm_prefork_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* child_init */
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_access.c 1999/08/01 14:12:32 1.11
+++ mod_access.c 1999/08/01 14:43:26 1.12
@@ -389,7 +389,6 @@
module MODULE_VAR_EXPORT access_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* initializer */
create_access_dir_config, /* dir config creater */
NULL, /* dir merger --- default is to override */
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_actions.c 1999/08/01 14:12:32 1.10
+++ mod_actions.c 1999/08/01 14:43:27 1.11
@@ -211,7 +211,6 @@
module action_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* child initializer */
create_action_dir_config, /* dir config creater */
merge_action_dir_configs, /* dir merger --- default is to
override */
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_alias.c 1999/08/01 14:12:32 1.12
+++ mod_alias.c 1999/08/01 14:43:27 1.13
@@ -406,7 +406,6 @@
module MODULE_VAR_EXPORT alias_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* initializer */
create_alias_dir_config, /* dir config creater */
merge_alias_dir_config, /* dir merger --- default is to override */
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_asis.c 1999/08/01 14:12:32 1.11
+++ mod_asis.c 1999/08/01 14:43:28 1.12
@@ -126,7 +126,6 @@
module MODULE_VAR_EXPORT asis_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* child initaliser */
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_auth.c 1999/08/01 14:12:32 1.11
+++ mod_auth.c 1999/08/01 14:43:28 1.12
@@ -318,7 +318,6 @@
module MODULE_VAR_EXPORT auth_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* initializer */
create_auth_dir_config, /* dir config creater */
NULL, /* dir merger --- default is to override */
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_autoindex.c 1999/08/01 14:12:33 1.11
+++ mod_autoindex.c 1999/08/01 14:43:28 1.12
@@ -1650,7 +1650,6 @@
module MODULE_VAR_EXPORT autoindex_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* child initializer */
create_autoindex_config, /* dir config creater */
merge_autoindex_configs, /* dir merger --- default is to override */
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_dir.c 1999/08/01 14:12:33 1.10
+++ mod_dir.c 1999/08/01 14:43:28 1.11
@@ -224,7 +224,6 @@
module MODULE_VAR_EXPORT dir_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* child_init */
create_dir_config, /* create per-directory config
structure */
merge_dir_configs, /* merge per-directory config
structures */
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_echo.c 1999/08/01 14:12:33 1.5
+++ mod_echo.c 1999/08/01 14:43:28 1.6
@@ -63,7 +63,6 @@
API_VAR_EXPORT module echo_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* child_init */
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_env.c 1999/08/01 14:12:33 1.12
+++ mod_env.c 1999/08/01 14:43:28 1.13
@@ -256,7 +256,6 @@
module MODULE_VAR_EXPORT env_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* child initializer */
create_env_dir_config, /* dir config creater */
merge_env_dir_configs, /* dir merger --- default is to override */
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_imap.c 1999/08/01 14:12:33 1.11
+++ mod_imap.c 1999/08/01 14:43:28 1.12
@@ -897,7 +897,6 @@
module MODULE_VAR_EXPORT imap_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* child initializer */
create_imap_dir_config, /* dir config creater */
merge_imap_dir_configs, /* dir merger --- default is to override */
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_log_config.c 1999/08/01 14:12:33 1.11
+++ mod_log_config.c 1999/08/01 14:43:29 1.12
@@ -1114,7 +1114,6 @@
module MODULE_VAR_EXPORT config_log_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* child_init */
NULL, /* create per-dir config */
NULL, /* merge per-dir config */
1.11 +1 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_mime.c 1999/08/01 14:12:33 1.10
+++ mod_mime.c 1999/08/01 14:43:29 1.11
@@ -382,11 +382,11 @@
static void register_hooks()
{
ap_hook_type_checker(find_ct,NULL,NULL,HOOK_MIDDLE);
+ ap_hook_post_config(mime_post_config,NULL,NULL,HOOK_MIDDLE);
}
module MODULE_VAR_EXPORT mime_module = {
STANDARD20_MODULE_STUFF,
- mime_post_config, /* post_config */
NULL, /* child_init */
create_mime_dir_config, /* create per-directory config structure */
merge_mime_dir_configs, /* merge per-directory config structures */
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_negotiation.c 1999/08/01 14:12:34 1.11
+++ mod_negotiation.c 1999/08/01 14:43:29 1.12
@@ -2733,7 +2733,6 @@
module MODULE_VAR_EXPORT negotiation_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* initializer */
create_neg_dir_config, /* dir config creator */
merge_neg_dir_configs, /* dir merger --- default is to override */
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_setenvif.c 1999/08/01 14:12:34 1.12
+++ mod_setenvif.c 1999/08/01 14:43:29 1.13
@@ -408,7 +408,6 @@
module MODULE_VAR_EXPORT setenvif_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* initializer */
NULL, /* dir config creater */
NULL, /* dir merger --- default is to override */
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_userdir.c 1999/08/01 14:12:34 1.12
+++ mod_userdir.c 1999/08/01 14:43:29 1.13
@@ -336,7 +336,6 @@
module userdir_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* post_config */
NULL, /* child initializer */
NULL, /* dir config creater */
NULL, /* dir merger --- default is to override */
