From a07f9b83c8369405393f6dc898a0d5e62730fcb4 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Wed, 1 May 2002 16:05:59 +0000 Subject: [PATCH] wait for worker threads to exit even in graceless termination (we already have code to make them exit sooner now) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94892 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/worker/worker.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index 54b461bf13..5c3d2acf21 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -1312,16 +1312,14 @@ static void child_main(int child_num_arg) } } - if (rv == AP_GRACEFUL) { - /* A terminating signal was received. Now join each of the - * workers to clean them up. - * If the worker already exited, then the join frees - * their resources and returns. - * If the worker hasn't exited, then this blocks until - * they have (then cleans up). - */ - join_workers(ts->listener, threads); - } + /* A terminating signal was received. Now join each of the + * workers to clean them up. + * If the worker already exited, then the join frees + * their resources and returns. + * If the worker hasn't exited, then this blocks until + * they have (then cleans up). + */ + join_workers(ts->listener, threads); } free(threads); -- 2.50.1