svn commit: r943650 - in /httpd/httpd/trunk: CHANGES server/mpm/prefork/prefork.c

[tr...@apache.org]

Author: trawick
Date: Wed May 12 19:41:19 2010
New Revision: 943650

URL: http://svn.apache.org/viewvc?rev=943650&view=rev
Log:
replace r942897 with the original submitted patch

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

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/mpm/prefork/prefork.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=943650&r1=943649&r2=943650&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed May 12 19:41:19 2010
@@ -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>]
 

Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=943650&r1=943649&r2=943650&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Wed May 12 19:41:19 2010
@@ -684,6 +684,7 @@ static void child_main(int child_num_arg
             die_now = 1;
         }
     }
+    apr_pool_clear(ptrans);
     clean_child_exit(0);
 }