From 8ff11aaf03349173e6ee26e65fe35daf5d9280c0 Mon Sep 17 00:00:00 2001 From: Bill Stoddard Date: Thu, 22 Mar 2001 19:29:09 +0000 Subject: [PATCH] Exit the child main thread in make_child on child exit. This fixes a problem where the child main thread was looping in make_child() forking errant processes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88564 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ server/mpm/threaded/threaded.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index b2f3846a75..3baca72813 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,7 @@ Changes with Apache 2.0.15-dev + *) Fix bug in the Unix threaded.c MPM that allowed child processes + to fork() new child processes. + [Bill Stoddard] *) Fix a major security problem with double-reverse lookup checking. Previously, a client connecting over IPv4 would not be matched diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c index 75bda0507f..c15d1cb685 100644 --- a/server/mpm/threaded/threaded.c +++ b/server/mpm/threaded/threaded.c @@ -762,7 +762,7 @@ static int make_child(server_rec *s, int slot) apr_signal(SIGTERM, just_die); child_main(slot); - return 0; + exit(0); } /* else */ ap_scoreboard_image->parent[slot].pid = pid; -- 2.40.0