httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r943648 - in /httpd/httpd/trunk: CHANGES server/mpm/prefork/prefork.c
Date Wed, 12 May 2010 19:36:47 GMT
Author: trawick
Date: Wed May 12 19:36:47 2010
New Revision: 943648

URL: http://svn.apache.org/viewvc?rev=943648&view=rev
Log:
revert the PR 43857 fix in r942897 based on a potential
memory leak pointed out by jorton
(original patch to be committed shortly)

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=943648&r1=943647&r2=943648&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed May 12 19:36:47 2010
@@ -28,9 +28,6 @@ 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, Jeff Trawick]
-
   *) 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=943648&r1=943647&r2=943648&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Wed May 12 19:36:47 2010
@@ -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



Mime
View raw message