diff options
author | William A. Rowe Jr <wrowe@apache.org> | 2001-01-19 08:04:36 +0100 |
---|---|---|
committer | William A. Rowe Jr <wrowe@apache.org> | 2001-01-19 08:04:36 +0100 |
commit | 59bbd68becf86e8485b1d863b7e66c82614c161a (patch) | |
tree | 41b86a03d3950ed7c77e7b625f0b16d7ac92f419 /server/main.c | |
parent | Remove some STATUS items that are already in APR's STATUS file. (diff) | |
download | apache2-59bbd68becf86e8485b1d863b7e66c82614c161a.tar.xz apache2-59bbd68becf86e8485b1d863b7e66c82614c161a.zip |
The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
for the quick glance at symbols changed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/main.c')
-rw-r--r-- | server/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/main.c b/server/main.c index b7967c9027..ee3b77b471 100644 --- a/server/main.c +++ b/server/main.c @@ -390,7 +390,7 @@ int main(int argc, const char * const argv[]) ap_process_config_tree(server_conf, ap_conftree, process->pconf, ptemp); ap_fixup_virtual_hosts(pconf, server_conf); ap_fini_vhost_config(pconf, server_conf); - ap_sort_hooks(); + apr_sort_hooks(); if (configtestonly) { ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "Syntax OK\n"); destroy_and_exit_process(process, 0); @@ -401,7 +401,7 @@ int main(int argc, const char * const argv[]) apr_destroy_pool(ptemp); for (;;) { - ap_hook_deregister_all(); + apr_hook_deregister_all(); apr_clear_pool(pconf); for (mod = ap_prelinked_modules; *mod != NULL; mod++) { ap_register_hooks(*mod, pconf); @@ -418,7 +418,7 @@ int main(int argc, const char * const argv[]) ap_process_config_tree(server_conf, ap_conftree, process->pconf, ptemp); ap_fixup_virtual_hosts(pconf, server_conf); ap_fini_vhost_config(pconf, server_conf); - ap_sort_hooks(); + apr_sort_hooks(); apr_clear_pool(plog); ap_run_open_logs(pconf, plog, ptemp, server_conf); ap_post_config_hook(pconf, plog, ptemp, server_conf); |