Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 22 Jun 2000 00:41:43 -0000
Message-ID: <20000622004143.12602.qmail@locus.apache.org>
From: dreid@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/main mpm_common.c

dreid       00/06/21 17:41:43

  Modified:    src/main mpm_common.c
  Log:
  Small change in an effort to get restarts working correctly on BeOS.
  
  Revision  Changes    Path
  1.14      +10 -0     apache-2.0/src/main/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/mpm_common.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mpm_common.c	2000/06/19 21:11:49	1.13
  +++ mpm_common.c	2000/06/22 00:41:43	1.14
  @@ -160,7 +160,17 @@
                                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