From: David Reid <dreid@apache.org>
Date: Thu, 22 Jun 2000 00:41:43 +0000 (+0000)
Subject: Small change in an effort to get restarts working correctly on BeOS.
X-Git-Tag: APACHE_2_0_ALPHA_5~270
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8182a95269c49942641d673b1fe0e5da2f809fd;p=apache

Small change in an effort to get restarts working correctly on BeOS.


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

diff --git a/server/mpm_common.c b/server/mpm_common.c
index cd2f54c69d..0a7aee56b0 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -160,7 +160,17 @@ void ap_reclaim_child_processes(int terminate)
                              0, ap_server_conf,
                    "child process %ld still did not exit, sending a SIGKILL",
                              (long)pid);
+#ifndef BEOS
                 kill(pid, SIGKILL);
+#else
+                /* sending a SIGKILL kills the entire team on BeOS, and as
+                 * httpd thread is part of that team it removes any chance
+                 * of ever doing a restart.  To counter this I'm changing to
+                 * use a kinder, gentler way of killing a specific thread
+                 * that is just as effective.
+                 */
+                kill_thread(pid);
+#endif
                 break;
             case 9:     /* 14 sec */
                 /* gave it our best shot, but alas...  If this really