Add in a configuration generation... this is independent of

MPM gen, just in case we ever switch MPMs at a graceful ;)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087331 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/http_core.h b/include/http_core.h
index e674915b8a41a573bf35574bbd1a5c9b52482933..ba66de84002a80539fd10154cadce2af1d207d9f 100644 (file)
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -808,6 +808,8 @@ AP_DECLARE(int) ap_state_query(int query_code);
 #define AP_SQ_MAIN_STATE        0
   /** are we going to serve requests or are we just testing/dumping config */
 #define AP_SQ_RUN_MODE          1
+    /** generation of the top-level apache parent */
+#define AP_SQ_CONFIG_GEN        2
 
 /*
  * return values for ap_state_query()

diff --git a/include/http_main.h b/include/http_main.h
index d23e049924c783e11ca059cb586c1006b26408ad..68ecf27a0de043b7155f782e7f3d3426cbd232e8 100644 (file)
--- a/include/http_main.h
+++ b/include/http_main.h
@@ -51,6 +51,8 @@ AP_DECLARE_DATA extern apr_pool_t *ap_pglobal;
 AP_DECLARE_DATA extern int ap_main_state;
 /** run mode (normal, config test, config dump, ...) */
 AP_DECLARE_DATA extern int ap_run_mode;
+/** run mode (normal, config test, config dump, ...) */
+AP_DECLARE_DATA extern int ap_config_generation;
 
 /* for -C, -c and -D switches */
 /** An array of all -C directives.  These are processed before the server's

diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 0b1c3dba973b7deb22e693f9e03d543c2dc45e86..7a816b2568af0eae9da0f2934e2b065d2d75513c 100644 (file)
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -390,7 +390,9 @@ static int status_handler(request_rec *r)
                              ap_scoreboard_image->global->restart_time,
                              DEFAULT_TIME_FORMAT, 0),
                   "</dt>\n", NULL);
-        ap_rprintf(r, "<dt>Parent Server Generation: %d</dt>\n",
+        ap_rprintf(r, "<dt>Parent Server Config. Generation: %d</dt>\n",
+                   ap_state_query(AP_SQ_CONFIG_GEN));
+        ap_rprintf(r, "<dt>Parent Server MPM Generation: %d</dt>\n",
                    (int)mpm_generation);
         ap_rputs("<dt>Server uptime: ", r);
         show_time(r, up_time);

diff --git a/server/core.c b/server/core.c
index 73ae3b8edb17a8871f5f3458ad44bd106caab6af..a521eac46500300918ced8c565d24b03307b61d1 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -112,6 +112,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;
 
 static void *create_core_dir_config(apr_pool_t *a, char *dir)
 {
@@ -4368,6 +4369,8 @@ AP_DECLARE(int) ap_state_query(int query)
         return ap_main_state;
     case AP_SQ_RUN_MODE:
         return ap_run_mode;
+    case AP_SQ_CONFIG_GEN:
+        return ap_config_generation;
     default:
         return AP_SQ_NOT_SUPPORTED;
     }

diff --git a/server/main.c b/server/main.c
index b1f445f124cb3e2c0f95f50d170568cad62418d8..3b38bdde15f464ea20c673bdc3b8d65a9248d69b 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -686,6 +686,7 @@ 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);