|
Lines 633-638
Link Here
|
| 633 |
if (!server_conf) { |
633 |
if (!server_conf) { |
| 634 |
destroy_and_exit_process(process, 1); |
634 |
destroy_and_exit_process(process, 1); |
| 635 |
} |
635 |
} |
|
|
636 |
/* sort hooks here to make sure pre_config hooks are sorted properly |
| 637 |
*/ |
| 636 |
apr_hook_sort_all(); |
638 |
apr_hook_sort_all(); |
| 637 |
|
639 |
|
| 638 |
if (ap_run_pre_config(pconf, plog, ptemp) != OK) { |
640 |
if (ap_run_pre_config(pconf, plog, ptemp) != OK) { |
|
Lines 646-651
Link Here
|
| 646 |
if (rv == OK) { |
648 |
if (rv == OK) { |
| 647 |
ap_fixup_virtual_hosts(pconf, server_conf); |
649 |
ap_fixup_virtual_hosts(pconf, server_conf); |
| 648 |
ap_fini_vhost_config(pconf, server_conf); |
650 |
ap_fini_vhost_config(pconf, server_conf); |
|
|
651 |
/* sort hooks again b/c ap_process_config_tree might add modules and |
| 652 |
* hence hooks. |
| 653 |
*/ |
| 654 |
apr_hook_sort_all(); |
| 649 |
|
655 |
|
| 650 |
if (configtestonly) { |
656 |
if (configtestonly) { |
| 651 |
ap_run_test_config(pconf, server_conf); |
657 |
ap_run_test_config(pconf, server_conf); |
|
Lines 704-709
Link Here
|
| 704 |
if (!server_conf) { |
710 |
if (!server_conf) { |
| 705 |
destroy_and_exit_process(process, 1); |
711 |
destroy_and_exit_process(process, 1); |
| 706 |
} |
712 |
} |
|
|
713 |
/* sort hooks here to make sure pre_config hooks are sorted properly |
| 714 |
*/ |
| 707 |
apr_hook_sort_all(); |
715 |
apr_hook_sort_all(); |
| 708 |
|
716 |
|
| 709 |
if (ap_run_pre_config(pconf, plog, ptemp) != OK) { |
717 |
if (ap_run_pre_config(pconf, plog, ptemp) != OK) { |
|
Lines 718-723
Link Here
|
| 718 |
} |
726 |
} |
| 719 |
ap_fixup_virtual_hosts(pconf, server_conf); |
727 |
ap_fixup_virtual_hosts(pconf, server_conf); |
| 720 |
ap_fini_vhost_config(pconf, server_conf); |
728 |
ap_fini_vhost_config(pconf, server_conf); |
|
|
729 |
/* sort hooks again b/c ap_process_config_tree might add modules and |
| 730 |
* hence hooks. |
| 731 |
*/ |
| 732 |
apr_hook_sort_all(); |
| 721 |
apr_pool_clear(plog); |
733 |
apr_pool_clear(plog); |
| 722 |
if (ap_run_open_logs(pconf, plog, ptemp, server_conf) != OK) { |
734 |
if (ap_run_open_logs(pconf, plog, ptemp, server_conf) != OK) { |
| 723 |
ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR, |
735 |
ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR, |