no need to kill the scoreboard cleanup anymore on graceful

restart; the scoreboard is longer-lived
PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 99bc1764436b66b5fc4e7aa5dc19740e8d32e409..a9657021375d922eef8ccaee041de2e964f73d84 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -246,9 +246,6 @@ static void ap_start_restart(int graceful)
     }
     restart_pending = 1;
     is_graceful = graceful;
-    if (is_graceful){
-        apr_pool_cleanup_kill(pconf, NULL, ap_cleanup_scoreboard);
-    }
 }
 
 static void sig_term(int sig)

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 7e031c4a43c990a937ebcdc9f772d23a22c5cc0e..94a3d0a0776f7acb8b7b3dd023ead5b0db220dfa 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -391,9 +391,6 @@ static void ap_start_restart(int graceful)
     }
     restart_pending = 1;
     is_graceful = graceful;
-    if (is_graceful) {
-        apr_pool_cleanup_kill(pconf, NULL, ap_cleanup_scoreboard);
-    }
 }
 
 static void sig_term(int sig)

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index 7e031c4a43c990a937ebcdc9f772d23a22c5cc0e..94a3d0a0776f7acb8b7b3dd023ead5b0db220dfa 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -391,9 +391,6 @@ static void ap_start_restart(int graceful)
     }
     restart_pending = 1;
     is_graceful = graceful;
-    if (is_graceful) {
-        apr_pool_cleanup_kill(pconf, NULL, ap_cleanup_scoreboard);
-    }
 }
 
 static void sig_term(int sig)

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 3dc600812488f9024d3d9cb5ab7bd758775cb489..81fc57607701c3caf97c42659b96134ed30a0517 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -389,9 +389,7 @@ static void restart(int sig)
        return;
     }
     restart_pending = 1;
-    if ((is_graceful = (sig == AP_SIG_GRACEFUL))) {
-        apr_pool_cleanup_kill(pconf, NULL, ap_cleanup_scoreboard);
-    }
+    is_graceful = (sig == AP_SIG_GRACEFUL);
 }
 
 static void set_signals(void)

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index e3b5cf03fe769bff3cc131e67d24f435826c7f4a..826278c0a711a0a0c1e2245871543195982094b3 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -411,9 +411,6 @@ static void ap_start_restart(int graceful)
     }
     restart_pending = 1;
     is_graceful = graceful;
-    if (is_graceful) {
-        apr_pool_cleanup_kill(pconf, NULL, ap_cleanup_scoreboard);
-    }
 }
 
 static void sig_term(int sig)