httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1021616 - in /httpd/httpd/trunk: CHANGES server/mpm/prefork/prefork.c
Date Tue, 12 Oct 2010 03:55:11 GMT
Author: trawick
Date: Tue Oct 12 03:55:11 2010
New Revision: 1021616

URL: http://svn.apache.org/viewvc?rev=1021616&view=rev
Log:
fix description of the change for PR43857; it is a work-around
for a reslist problem that isn't fixed in apr-util 1.3.x

Suggested by: jorton

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=1021616&r1=1021615&r2=1021616&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Oct 12 03:55:11 2010
@@ -334,8 +334,8 @@ Changes with Apache 2.3.6
   *) apxs -q: Stop filtering out ':' characters from the reported values.
      PR 45343.  [Bill Cole]
 
-  *) prefork MPM: Run cleanups for final request when process exits gracefully.
-     PR 43857.  [Tom Donovan]
+  *) prefork MPM: Work around possible crashes on child exit in APR reslist
+     cleanup code.  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=1021616&r1=1021615&r2=1021616&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Tue Oct 12 03:55:11 2010
@@ -684,7 +684,7 @@ static void child_main(int child_num_arg
             die_now = 1;
         }
     }
-    apr_pool_clear(ptrans);
+    apr_pool_clear(ptrans); /* kludge to avoid crash in APR reslist cleanup code */
     clean_child_exit(0);
 }
 



Mime
View raw message