From: Greg Ames <gregames@apache.org>
Date: Sun, 10 Feb 2002 14:21:44 +0000 (+0000)
Subject: prefork shouldn't be killing its parent if a child runs out of resources.
X-Git-Tag: 2.0.33~309
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f18df952b818a2d02df14c0ad361dff0ad5a8294;p=apache

prefork shouldn't be killing its parent if a child runs out of resources.


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

diff --git a/CHANGES b/CHANGES
index 81c3076076..72a5ccc776 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 Changes with Apache 2.0.32-dev
+ 
+  *) Fix prefork to not kill the parent if a child hits a resource shortage
+     on accept().  [Greg Ames]
 
   *) Fix seg faults that occur when what should be the httpd request line
      starts with \r\n followed by garbage.  [Greg Ames]
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 3cecebe224..a0cf5b9238 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -701,9 +701,9 @@ static void child_main(int child_num_arg)
                 break;
             }
             if (status == APR_EGENERAL) {
-                clean_child_exit(APEXIT_CHILDFATAL);
+                /* resource shortage or should-not-occur occured */
+                clean_child_exit(1);
             }
-            ap_sync_scoreboard_image();
         }
 	SAFE_ACCEPT(accept_mutex_off());	/* unlock after "accept" */