Clean up "dead" child if there's no thread associated with the request

diff --git a/src/main/event.c b/src/main/event.c
index 186bdc5b1b4ba648c3df70930451a6d8817a1004..1d0849ebf9b7f70ef1b17b937c2793bde29eb431 100644 (file)
--- a/src/main/event.c
+++ b/src/main/event.c
@@ -469,8 +469,14 @@ static void wait_for_child_to_die(void *ctx)
 
        rad_assert(request->magic == REQUEST_MAGIC);
 
-       if ((request->child_state == REQUEST_QUEUED) |
-           (request->child_state == REQUEST_RUNNING)) {
+       /*
+        *      If it's still queued (waiting for a thread to pick it
+        *      up) OR, it's running AND there's still a child thread
+        *      handling it, THEN delay some more.
+        */
+       if ((request->child_state == REQUEST_QUEUED) ||
+           ((request->child_state == REQUEST_RUNNING) &&
+            (pthread_equal(request->child_pid, NO_SUCH_CHILD_PID) == 0))) {
 
                /*
                 *      Cap delay at five minutes.