From: Jeff Trawick Date: Wed, 12 May 2010 19:36:47 +0000 (+0000) Subject: revert the PR 43857 fix in r942897 based on a potential X-Git-Tag: 2.3.6~124 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d24fd9927c4767e4ecc746484270ee2576d103f2;p=apache revert the PR 43857 fix in r942897 based on a potential memory leak pointed out by jorton (original patch to be committed shortly) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@943648 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 7bc155f7aa..e7ec7a405a 100644 --- a/CHANGES +++ b/CHANGES @@ -28,9 +28,6 @@ Changes with Apache 2.3.7 processing is completed, avoiding orphaned callback pointers. [Brett Gervasoni , Jeff Trawick] - *) prefork MPM: Run cleanups for final request when process exits gracefully. - PR 43857. [Tom Donovan, Jeff Trawick] - *) ab: fix number of requests sent by ab when keepalive is enabled. PR 48497. [Bryn Dole ] diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index b1a93c0702..358a9997a1 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -549,6 +549,12 @@ static void child_main(int child_num_arg) conn_rec *current_conn; void *csd; + /* + * (Re)initialize this child to a pre-connection state. + */ + + apr_pool_clear(ptrans); + if ((ap_max_requests_per_child > 0 && requests_this_child++ >= ap_max_requests_per_child)) { clean_child_exit(0); @@ -662,12 +668,6 @@ static void child_main(int child_num_arg) ap_lingering_close(current_conn); } - /* - * (Re)initialize this child to a pre-connection state. - */ - - apr_pool_clear(ptrans); - /* Check the pod and the generation number after processing a * connection so that we'll go away if a graceful restart occurred * while we were processing the connection or we are the lucky