From eada6f82551526e194f76ed0702f23a574f3b26a Mon Sep 17 00:00:00 2001
From: Jeff Trawick <trawick@apache.org>
Date: Wed, 20 Mar 2002 20:38:52 +0000
Subject: [PATCH] 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
---
 server/mpm/beos/beos.c                      | 3 ---
 server/mpm/experimental/perchild/perchild.c | 3 ---
 server/mpm/perchild/perchild.c              | 3 ---
 server/mpm/prefork/prefork.c                | 4 +---
 server/mpm/worker/worker.c                  | 3 ---
 5 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 99bc176443..a965702137 100644
--- 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 7e031c4a43..94a3d0a077 100644
--- 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 7e031c4a43..94a3d0a077 100644
--- 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 3dc6008124..81fc576077 100644
--- 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 e3b5cf03fe..826278c0a7 100644
--- 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)
-- 
2.50.1