diff options
| author | Ryan Bloom <rbb@apache.org> | 2000-06-03 18:27:03 +0200 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2000-06-03 18:27:03 +0200 |
| commit | 71d8e39db698e32f9d5143f11eac94d2af81db62 (patch) | |
| tree | ebf4b2f8e9e613f277130df33401d69e36e4417d /include | |
| parent | mod_cgi: Make ScriptLog directive work again by fixing the (diff) | |
| download | apache2-71d8e39db698e32f9d5143f11eac94d2af81db62.tar.xz apache2-71d8e39db698e32f9d5143f11eac94d2af81db62.zip | |
Modify the config order so that we read the config, process all EXEC_ON_READ
directives at the same time, run pre_config hook for all modules, and
then walk the tree. This allows all modules to have a pre_config hook and
know that it will be called at a reasonable time. I also made "Include"
an EXEC_ON_READ directive so that it is included in the tree properly.
This was required after the other changes that were made.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85393 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/http_config.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/http_config.h b/include/http_config.h index efe0af0368..d1c70d1bba 100644 --- a/include/http_config.h +++ b/include/http_config.h @@ -380,7 +380,7 @@ void ap_single_module_configure(ap_pool_t *p, server_rec *s, module *m); API_EXPORT(void) ap_setup_prelinked_modules(process_rec *process); API_EXPORT(void) ap_show_directives(void); API_EXPORT(void) ap_show_modules(void); -API_EXPORT(server_rec*) ap_read_config(process_rec *process, ap_pool_t *temp_pool, const char *config_name); +API_EXPORT(server_rec*) ap_read_config(process_rec *process, ap_pool_t *temp_pool, const char *config_name, ap_directive_t **conftree); API_EXPORT(void) ap_pre_config_hook(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s); API_EXPORT(void) ap_post_config_hook(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s); API_EXPORT(void) ap_run_rewrite_args(process_rec *process); @@ -403,7 +403,11 @@ int ap_parse_htaccess(void **result, request_rec *r, int override, CORE_EXPORT(const char *) ap_init_virtual_host(ap_pool_t *p, const char *hostname, server_rec *main_server, server_rec **); -void ap_process_resource_config(server_rec *s, const char *fname, ap_pool_t *p, ap_pool_t *ptemp); +void ap_process_resource_config(server_rec *s, const char *fname, + ap_directive_t **conftree, ap_pool_t *p, ap_pool_t *ptemp); +void ap_process_config_tree(server_rec *s, ap_directive_t *conftree, + ap_pool_t *p, ap_pool_t *ptemp); + /* For individual MPMs... */ |