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 81c30760764b3bb7c16cf59a58aa61892c3294b8..72a5ccc776dd91246acf3b095a0607b10daf4619 100644 (file)
--- 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 3cecebe224c53b85779eb35ce905e3af7c037be8..a0cf5b9238c80af6ea989683bc96c7f9606b5d4b 100644 (file)
--- 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" */