Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 95543 invoked from network); 12 May 2010 19:41:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 12 May 2010 19:41:43 -0000 Received: (qmail 10744 invoked by uid 500); 12 May 2010 19:41:43 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 10577 invoked by uid 500); 12 May 2010 19:41:43 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 10570 invoked by uid 99); 12 May 2010 19:41:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 May 2010 19:41:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 May 2010 19:41:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 33F8B23888FE; Wed, 12 May 2010 19:41:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r943650 - in /httpd/httpd/trunk: CHANGES server/mpm/prefork/prefork.c Date: Wed, 12 May 2010 19:41:20 -0000 To: cvs@httpd.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100512194120.33F8B23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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 , 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 ] 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); }