replace r942897 with the original submitted patch

prefork MPM: Run cleanups for final request when process exits gracefully.
PR: 43857
Submitted by: Tom Donovan

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

diff --git a/CHANGES b/CHANGES
index e7ec7a405a887db912fdb1eb4ec49c43fed17106..1ed3a85b1c5673b5db8f57b8ca4889af7d9c6bf8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,9 @@ Changes with Apache 2.3.7
      processing is completed, avoiding orphaned callback pointers.
      [Brett Gervasoni <brettg senseofsecurity.com>, Jeff Trawick]
 
+  *) prefork MPM: Run cleanups for final request when process exits gracefully.
+     PR 43857.  [Tom Donovan]
+
   *) ab: fix number of requests sent by ab when keepalive is enabled.  PR 48497.
      [Bryn Dole <dole blekko.com>]
 

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 358a9997a11525be300b79e91c9242b708568c37..d0947c2df7fd9d14f8c8f85c128341d000814d45 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -684,6 +684,7 @@ static void child_main(int child_num_arg)
             die_now = 1;
         }
     }
+    apr_pool_clear(ptrans);
     clean_child_exit(0);
 }