prefork and worker:

after allocating a new scoreboard, make sure the right generation
is stored in the global score

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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index f2710eb35fc65cc433d09926816b4f0f700aa0a9..43121289b30b8cf51f198941b29b85a3007da7e7 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -972,6 +972,11 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
         if (ap_run_pre_mpm(pconf, SB_SHARED) != OK) {
             return 1;
         }
+        /* fix the generation number in the global score; we just got a new,
+         * cleared scoreboard
+         */
+        ap_scoreboard_image->global->running_generation = ap_my_generation;
+        update_scoreboard_global();
     }
 #ifdef SCOREBOARD_FILE
     else {

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index d199c91db42552d8e5241bd036875235dd93e731..d9859ebd76c8979c810f79f7c2629bc9efda1fb5 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1424,6 +1424,11 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
         if (ap_run_pre_mpm(pconf, SB_SHARED) != OK) {
             return 1;
         }
+        /* fix the generation number in the global score; we just got a new,
+         * cleared scoreboard
+         */
+        ap_scoreboard_image->global->running_generation = ap_my_generation;
+        update_scoreboard_global();
     }
 
     set_signals();