dgaudet 97/07/17 15:28:02
Modified: src CHANGES http_config.c http_config.h http_core.c
http_main.c mod_access.c mod_actions.c mod_alias.c
mod_asis.c mod_auth.c mod_auth_anon.c
mod_auth_db.c mod_auth_dbm.c mod_auth_msql.c
mod_autoindex.c mod_browser.c mod_cern_meta.c
mod_cgi.c mod_digest.c mod_dir.c mod_dld.c
mod_env.c mod_expires.c mod_headers.c mod_imap.c
mod_include.c mod_info.c mod_log_agent.c
mod_log_config.c mod_log_referer.c mod_mime.c
mod_mime_magic.c mod_negotiation.c mod_rewrite.c
mod_status.c mod_userdir.c mod_usertrack.c
src/modules/example mod_example.c
src/modules/proxy mod_proxy.c
Log:
Added child_init method.
Revision Changes Path
1.343 +4 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.342
retrieving revision 1.343
diff -C3 -r1.342 -r1.343
*** CHANGES 1997/07/17 21:38:15 1.342
--- CHANGES 1997/07/17 22:27:27 1.343
***************
*** 1,5 ****
--- 1,9 ----
Changes with Apache 1.3
+ *) API: Added child_init function to module structure. This is called
+ once per "heavy-weight process" before any requests are handled.
+ See http_config.h for more details. [Dean Gaudet]
+
*) Anonymous_LogEmail was logging on each subrequest.
[Dean Gaudet] PR#421, 868
1.61 +9 -0 apache/src/http_config.c
Index: http_config.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_config.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C3 -r1.60 -r1.61
*** http_config.c 1997/07/15 21:39:52 1.60
--- http_config.c 1997/07/17 22:27:28 1.61
***************
*** 1216,1221 ****
--- 1216,1230 ----
(*m->init) (s, p);
}
+ void child_init_modules(pool *p, server_rec *s)
+ {
+ module *m;
+
+ for (m = top_module; m; m = m->next)
+ if (m->child_init)
+ (*m->child_init) (s, p);
+ }
+
/********************************************************************
* Configuration directives are restricted in terms of where they may
* appear in the main configuration files and/or .htaccess files according
1.36 +13 -0 apache/src/http_config.h
Index: http_config.h
===================================================================
RCS file: /export/home/cvs/apache/src/http_config.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C3 -r1.35 -r1.36
*** http_config.h 1997/07/15 21:39:52 1.35
--- http_config.h 1997/07/17 22:27:28 1.36
***************
*** 217,222 ****
--- 217,234 ----
int (*fixer_upper)(request_rec *);
int (*logger)(request_rec *);
int (*header_parser)(request_rec *);
+
+ /* Regardless of the model the server uses for managing "units of
+ * execution", i.e. multi-process, multi-threaded, hybrids of those,
+ * there is the concept of a "heavy weight process". That is, a
+ * process with its own memory space, file spaces, etc. This method,
+ * child_init, is called once for each heavy-weight process before
+ * any requests are served. Note that no provision is made yet for
+ * initialization per light-weight process (i.e. thread). The
+ * parameters passed here are the same as those passed to the global
+ * init method above.
+ */
+ int (*child_init)(server_rec *, pool *);
} module;
/* Initializer for the first few module slots, which are only
***************
*** 262,267 ****
--- 274,280 ----
server_rec *read_config (pool *conf_pool, pool *temp_pool, char
*config_name);
void init_modules(pool *p, server_rec *s);
+ void child_init_modules(pool *p, server_rec *s);
void setup_prelinked_modules();
void show_directives();
void show_modules();
1.97 +2 -1 apache/src/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -C3 -r1.96 -r1.97
*** http_core.c 1997/07/16 00:41:21 1.96
--- http_core.c 1997/07/17 22:27:29 1.97
***************
*** 1448,1452 ****
do_nothing, /* type_checker */
NULL, /* pre-run fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 1448,1453 ----
do_nothing, /* type_checker */
NULL, /* pre-run fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.180 +5 -3 apache/src/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.179
retrieving revision 1.180
diff -C3 -r1.179 -r1.180
*** http_main.c 1997/07/15 21:39:54 1.179
--- http_main.c 1997/07/17 22:27:30 1.180
***************
*** 2098,2106 ****
child_num = child_num_arg;
requests_this_child = 0;
- reopen_scoreboard(pconf);
- (void)update_child_status(child_num, SERVER_READY, (request_rec*)NULL);
-
#ifdef MPE
/* Only try to switch if we're running as MANAGER.SYS */
if (geteuid() == 1 && user_id > 1) {
--- 2098,2103 ----
***************
*** 2118,2123 ****
--- 2115,2125 ----
GETUSERMODE();
}
#endif
+
+ child_init_modules(pconf, server_conf);
+
+ reopen_scoreboard(pconf);
+ (void)update_child_status(child_num, SERVER_READY, (request_rec*)NULL);
/*
* Setup the jump buffers so that we can return here after
1.18 +2 -1 apache/src/mod_access.c
Index: mod_access.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_access.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C3 -r1.17 -r1.18
*** mod_access.c 1997/07/13 19:01:14 1.17
--- mod_access.c 1997/07/17 22:27:30 1.18
***************
*** 279,283 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 279,284 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.13 +2 -1 apache/src/mod_actions.c
Index: mod_actions.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_actions.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C3 -r1.12 -r1.13
*** mod_actions.c 1997/05/08 11:27:29 1.12
--- mod_actions.c 1997/07/17 22:27:31 1.13
***************
*** 215,219 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 215,220 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.19 +2 -1 apache/src/mod_alias.c
Index: mod_alias.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_alias.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C3 -r1.18 -r1.19
*** mod_alias.c 1997/07/13 19:01:14 1.18
--- mod_alias.c 1997/07/17 22:27:31 1.19
***************
*** 384,388 ****
NULL, /* type_checker */
fixup_redir, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 384,389 ----
NULL, /* type_checker */
fixup_redir, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.15 +2 -1 apache/src/mod_asis.c
Index: mod_asis.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_asis.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C3 -r1.14 -r1.15
*** mod_asis.c 1997/07/15 22:36:51 1.14
--- mod_asis.c 1997/07/17 22:27:31 1.15
***************
*** 126,130 ****
NULL, /* type_checker */
NULL, /* pre-run fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 126,131 ----
NULL, /* type_checker */
NULL, /* pre-run fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.19 +2 -1 apache/src/mod_auth.c
Index: mod_auth.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C3 -r1.18 -r1.19
*** mod_auth.c 1997/07/15 22:36:51 1.18
--- mod_auth.c 1997/07/17 22:27:31 1.19
***************
*** 296,300 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 296,301 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.19 +2 -1 apache/src/mod_auth_anon.c
Index: mod_auth_anon.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth_anon.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C3 -r1.18 -r1.19
*** mod_auth_anon.c 1997/07/17 21:38:16 1.18
--- mod_auth_anon.c 1997/07/17 22:27:32 1.19
***************
*** 295,299 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 295,300 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.13 +2 -1 apache/src/mod_auth_db.c
Index: mod_auth_db.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth_db.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C3 -r1.12 -r1.13
*** mod_auth_db.c 1997/04/24 10:16:55 1.12
--- mod_auth_db.c 1997/07/17 22:27:32 1.13
***************
*** 299,303 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 299,304 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.17 +2 -1 apache/src/mod_auth_dbm.c
Index: mod_auth_dbm.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth_dbm.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C3 -r1.16 -r1.17
*** mod_auth_dbm.c 1997/06/30 01:28:29 1.16
--- mod_auth_dbm.c 1997/07/17 22:27:32 1.17
***************
*** 292,296 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 292,297 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.21 +2 -1 apache/src/mod_auth_msql.c
Index: mod_auth_msql.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth_msql.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C3 -r1.20 -r1.21
*** mod_auth_msql.c 1997/03/07 14:15:38 1.20
--- mod_auth_msql.c 1997/07/17 22:27:33 1.21
***************
*** 992,996 ****
NULL, /* type_checker */
NULL, /* pre-run fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 992,997 ----
NULL, /* type_checker */
NULL, /* pre-run fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.39 +2 -1 apache/src/mod_autoindex.c
Index: mod_autoindex.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_autoindex.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C3 -r1.38 -r1.39
*** mod_autoindex.c 1997/07/15 22:36:52 1.38
--- mod_autoindex.c 1997/07/17 22:27:33 1.39
***************
*** 947,951 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 947,952 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.11 +2 -1 apache/src/mod_browser.c
Index: mod_browser.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_browser.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C3 -r1.10 -r1.11
*** mod_browser.c 1997/07/17 20:01:22 1.10
--- mod_browser.c 1997/07/17 22:27:34 1.11
***************
*** 185,189 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! parse_headers_browser_module /* header parser */
};
--- 185,190 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! parse_headers_browser_module,/* header parser */
! NULL /* child_init */
};
1.14 +2 -1 apache/src/mod_cern_meta.c
Index: mod_cern_meta.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_cern_meta.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C3 -r1.13 -r1.14
*** mod_cern_meta.c 1997/07/17 20:01:22 1.13
--- mod_cern_meta.c 1997/07/17 22:27:34 1.14
***************
*** 321,325 ****
NULL, /* type_checker */
add_cern_meta_data, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 321,326 ----
NULL, /* type_checker */
add_cern_meta_data, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.49 +2 -1 apache/src/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -C3 -r1.48 -r1.49
*** mod_cgi.c 1997/07/14 11:28:56 1.48
--- mod_cgi.c 1997/07/17 22:27:34 1.49
***************
*** 582,586 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 582,587 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.16 +2 -1 apache/src/mod_digest.c
Index: mod_digest.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_digest.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C3 -r1.15 -r1.16
*** mod_digest.c 1997/07/17 20:01:22 1.15
--- mod_digest.c 1997/07/17 22:27:35 1.16
***************
*** 359,363 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 359,364 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.38 +2 -1 apache/src/mod_dir.c
Index: mod_dir.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_dir.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C3 -r1.37 -r1.38
*** mod_dir.c 1997/07/17 20:01:23 1.37
--- mod_dir.c 1997/07/17 22:27:35 1.38
***************
*** 209,213 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 209,214 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.8 +2 -1 apache/src/mod_dld.c
Index: mod_dld.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_dld.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** mod_dld.c 1997/03/07 14:15:40 1.7
--- mod_dld.c 1997/07/17 22:27:35 1.8
***************
*** 186,190 ****
NULL, /* check access */
NULL, /* type_checker */
NULL, /* logger */
! NULL /* header parser */
};
--- 186,191 ----
NULL, /* check access */
NULL, /* type_checker */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.12 +2 -1 apache/src/mod_env.c
Index: mod_env.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_env.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C3 -r1.11 -r1.12
*** mod_env.c 1997/07/17 20:01:23 1.11
--- mod_env.c 1997/07/17 22:27:35 1.12
***************
*** 257,261 ****
NULL, /* type_checker */
fixup_env_module, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 257,262 ----
NULL, /* type_checker */
fixup_env_module, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.11 +2 -1 apache/src/mod_expires.c
Index: mod_expires.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_expires.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C3 -r1.10 -r1.11
*** mod_expires.c 1997/07/17 20:01:23 1.10
--- mod_expires.c 1997/07/17 22:27:36 1.11
***************
*** 481,485 ****
NULL, /* type_checker */
add_expires, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 481,486 ----
NULL, /* type_checker */
add_expires, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.6 +2 -1 apache/src/mod_headers.c
Index: mod_headers.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_headers.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C3 -r1.5 -r1.6
*** mod_headers.c 1997/07/17 20:01:24 1.5
--- mod_headers.c 1997/07/17 22:27:36 1.6
***************
*** 249,253 ****
NULL, /* type_checker */
fixup_headers, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 249,254 ----
NULL, /* type_checker */
fixup_headers, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.24 +2 -1 apache/src/mod_imap.c
Index: mod_imap.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_imap.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C3 -r1.23 -r1.24
*** mod_imap.c 1997/07/17 20:01:24 1.23
--- mod_imap.c 1997/07/17 22:27:36 1.24
***************
*** 833,837 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 833,838 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.42 +2 -1 apache/src/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_include.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C3 -r1.41 -r1.42
*** mod_include.c 1997/07/16 23:08:18 1.41
--- mod_include.c 1997/07/17 22:27:37 1.42
***************
*** 2053,2057 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 2053,2058 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.20 +2 -1 apache/src/mod_info.c
Index: mod_info.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_info.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C3 -r1.19 -r1.20
*** mod_info.c 1997/07/17 20:01:24 1.19
--- mod_info.c 1997/07/17 22:27:37 1.20
***************
*** 452,456 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 452,457 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.14 +2 -1 apache/src/mod_log_agent.c
Index: mod_log_agent.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_log_agent.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C3 -r1.13 -r1.14
*** mod_log_agent.c 1997/06/16 15:38:55 1.13
--- mod_log_agent.c 1997/07/17 22:27:38 1.14
***************
*** 198,202 ****
NULL, /* type_checker */
NULL, /* fixups */
agent_log_transaction, /* logger */
! NULL /* header parser */
};
--- 198,203 ----
NULL, /* type_checker */
NULL, /* fixups */
agent_log_transaction, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.32 +2 -1 apache/src/mod_log_config.c
Index: mod_log_config.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_log_config.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C3 -r1.31 -r1.32
*** mod_log_config.c 1997/07/17 20:01:25 1.31
--- mod_log_config.c 1997/07/17 22:27:38 1.32
***************
*** 789,793 ****
NULL, /* type_checker */
NULL, /* fixups */
multi_log_transaction, /* logger */
! NULL /* header parser */
};
--- 789,794 ----
NULL, /* type_checker */
NULL, /* fixups */
multi_log_transaction, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.14 +2 -1 apache/src/mod_log_referer.c
Index: mod_log_referer.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_log_referer.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C3 -r1.13 -r1.14
*** mod_log_referer.c 1997/06/16 15:38:55 1.13
--- mod_log_referer.c 1997/07/17 22:27:38 1.14
***************
*** 236,240 ****
NULL, /* type_checker */
NULL, /* fixups */
referer_log_transaction, /* logger */
! NULL /* header parser */
};
--- 236,241 ----
NULL, /* type_checker */
NULL, /* fixups */
referer_log_transaction, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.19 +2 -1 apache/src/mod_mime.c
Index: mod_mime.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_mime.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C3 -r1.18 -r1.19
*** mod_mime.c 1997/07/13 19:01:15 1.18
--- mod_mime.c 1997/07/17 22:27:39 1.19
***************
*** 320,324 ****
find_ct, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 320,325 ----
find_ct, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.6 +2 -1 apache/src/mod_mime_magic.c
Index: mod_mime_magic.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_mime_magic.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C3 -r1.5 -r1.6
*** mod_mime_magic.c 1997/07/16 00:58:00 1.5
--- mod_mime_magic.c 1997/07/17 22:27:39 1.6
***************
*** 2548,2552 ****
NULL, /* check access */
magic_find_ct, /* type_checker */
NULL, /* fixups */
! NULL /* logger */
};
--- 2548,2553 ----
NULL, /* check access */
magic_find_ct, /* type_checker */
NULL, /* fixups */
! NULL, /* logger */
! NULL /* child_init */
};
1.49 +2 -1 apache/src/mod_negotiation.c
Index: mod_negotiation.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -C3 -r1.48 -r1.49
*** mod_negotiation.c 1997/07/17 20:01:25 1.48
--- mod_negotiation.c 1997/07/17 22:27:40 1.49
***************
*** 2041,2045 ****
handle_multi, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 2041,2046 ----
handle_multi, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.33 +2 -1 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C3 -r1.32 -r1.33
*** mod_rewrite.c 1997/07/13 09:04:51 1.32
--- mod_rewrite.c 1997/07/17 22:27:40 1.33
***************
*** 217,223 ****
hook_fixup, /* [#7] pre-run fixups */
NULL, /* [#9] log a transaction */
! NULL /* [#3] header parser */
};
/* the cache */
--- 217,224 ----
hook_fixup, /* [#7] pre-run fixups */
NULL, /* [#9] log a transaction */
! NULL, /* [#3] header parser */
! NULL /* child_init */
};
/* the cache */
1.53 +2 -1 apache/src/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_status.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -C3 -r1.52 -r1.53
*** mod_status.c 1997/07/17 20:01:26 1.52
--- mod_status.c 1997/07/17 22:27:41 1.53
***************
*** 669,673 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 669,674 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.18 +2 -1 apache/src/mod_userdir.c
Index: mod_userdir.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_userdir.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C3 -r1.17 -r1.18
*** mod_userdir.c 1997/06/30 20:38:53 1.17
--- mod_userdir.c 1997/07/17 22:27:42 1.18
***************
*** 337,341 ****
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 337,342 ----
NULL, /* type_checker */
NULL, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.14 +2 -1 apache/src/mod_usertrack.c
Index: mod_usertrack.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_usertrack.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C3 -r1.13 -r1.14
*** mod_usertrack.c 1997/07/17 20:01:26 1.13
--- mod_usertrack.c 1997/07/17 22:27:42 1.14
***************
*** 338,342 ****
NULL, /* type_checker */
spot_cookie, /* fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 338,343 ----
NULL, /* type_checker */
spot_cookie, /* fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};
1.11 +2 -1 apache/src/modules/example/mod_example.c
Index: mod_example.c
===================================================================
RCS file: /export/home/cvs/apache/src/modules/example/mod_example.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C3 -r1.10 -r1.11
*** mod_example.c 1997/05/05 20:41:55 1.10
--- mod_example.c 1997/07/17 22:28:00 1.11
***************
*** 1106,1110 ****
example_typer, /* [6] MIME type checker/setter */
example_fixer, /* [7] fixups */
example_logger, /* [9] logger */
! example_hparser /* [2] header parser */
};
--- 1106,1111 ----
example_typer, /* [6] MIME type checker/setter */
example_fixer, /* [7] fixups */
example_logger, /* [9] logger */
! example_hparser, /* [2] header parser */
! NULL /* child_init */
};
1.15 +2 -1 apache/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /export/home/cvs/apache/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C3 -r1.14 -r1.15
*** mod_proxy.c 1997/06/28 23:39:54 1.14
--- mod_proxy.c 1997/07/17 22:28:01 1.15
***************
*** 556,561 ****
NULL, /* type_checker */
proxy_fixup, /* pre-run fixups */
NULL, /* logger */
! NULL /* header parser */
};
--- 556,562 ----
NULL, /* type_checker */
proxy_fixup, /* pre-run fixups */
NULL, /* logger */
! NULL, /* header parser */
! NULL /* child_init */
};