From 239e4c0466ed7146de4bc404cd185ccd45b1235b Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Thu, 10 Nov 2011 04:52:52 +0000 Subject: [PATCH] config generation # (reported by ap_state_query(AP_SQ_CONFIG_GEN): * start at 0 instead of 1 * don't increment until after pconf cleanups run, in case a cleanup needs to check the related config generation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200147 13f79535-47bb-0310-9956-ffa450edef68 --- server/core.c | 2 +- server/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/core.c b/server/core.c index 48c430098b..dc06843269 100644 --- a/server/core.c +++ b/server/core.c @@ -120,7 +120,7 @@ static apr_table_t *server_config_defined_vars = NULL; AP_DECLARE_DATA int ap_main_state = AP_SQ_MS_INITIAL_STARTUP; AP_DECLARE_DATA int ap_run_mode = AP_SQ_RM_UNKNOWN; -AP_DECLARE_DATA int ap_config_generation = 1; +AP_DECLARE_DATA int ap_config_generation = 0; static void *create_core_dir_config(apr_pool_t *a, char *dir) { diff --git a/server/main.c b/server/main.c index 6c2685dbee..1cb2f75d9c 100644 --- a/server/main.c +++ b/server/main.c @@ -697,13 +697,13 @@ int main(int argc, const char * const argv[]) apr_pool_destroy(ptemp); for (;;) { - ap_config_generation++; ap_main_state = AP_SQ_MS_DESTROY_CONFIG; apr_hook_deregister_all(); apr_pool_clear(pconf); ap_clear_auth_internal(); ap_main_state = AP_SQ_MS_CREATE_CONFIG; + ap_config_generation++; for (mod = ap_prelinked_modules; *mod != NULL; mod++) { ap_register_hooks(*mod, pconf); } -- 2.40.0