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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1021616 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index d586f7420291e46912ecd3f73564cd5eb27a1cfc..d41c9a173d5d37c983548b4e9307066900497f7a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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>]

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 89e8f28aa728e5d89a9eaeeb52eabd503cddb66e..08a53a3ca743e6cc619bc4c5ec3a1c970d1c3d84 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -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);
 }