prefork MPM: Run cleanups for final request when process exits gracefully,

in spite of faulty apr_reslist code.

Backports: r943650
PR: 43857
Submitted by: Tom Donovan
Reviewed by: trawick, rjung, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1021621 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 92ccdee6d6e0bf5f42e02a290c36f6f5275fa651..09a2c64c8b27eec701b02a7ae9b7a7bd9a0b16ea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.17
 
+  *) prefork MPM: Run cleanups for final request when process exits gracefully
+     to work around a flaw in apr-util.  PR 43857.  [Tom Donovan]
+
   *) mod_reqtimeout: Do not wrongly enforce timeouts for mod_proxy's backend
      connections and other protocol handlers (like mod_ftp). Enforce the
      timeout for AP_MODE_GETLINE. If there is a timeout, shorten the lingering

diff --git a/STATUS b/STATUS
index ce7fb27d843abae544a92c0adac5f78352928116..e74365971fb48d6fbfae03bed66f4c03df22a98f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -84,27 +84,13 @@ CURRENT RELEASE NOTES:
 RELEASE SHOWSTOPPERS:
 
 
+
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * prefork MPM: Run cleanups for final request when process exits gracefully.
-    PR: 43857
-    Trunk patch: http://svn.apache.org/viewvc?rev=943650&view=rev
-    2.2.x patch: Trunk patch works
-    (on hold) +1: trawick, rjung, wrowe
-    jorton points out that the problem symptom was probably the reslist
-    issue, which may have a better fix; also, this change could hide 
-    other problems:
-      http://www.mail-archive.com/dev@apr.apache.org/msg23090.html
-    wrowe adds that the pre_cleanup registration is not in apr-util 1.3, it was
-    never backported, and that if this patch works, it's probably the best solve
-    for legacy 2.2.
-    jorton's requested footnotes for backport are at
-      http://mail-archives.apache.org/mod_mbox/httpd-dev/201010.mbox/%3C20101007095048.GA5423@redhat.com%3E
-      [/NOT/i redundant]
-
-
- PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
  * unixd: set suexec_enabled correctly when httpd is run by non-root

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 28b60573f1129ba76fb48ded190f0044f7a76eb4..f5a72057bc73562ef544ac488cb59989f36adfdb 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -679,6 +679,11 @@ static void child_main(int child_num_arg)
             die_now = 1;
         }
     }
+    /* This apr_pool_clear call is redundant, should be redundant, but compensates
+     * a flaw in the apr reslist code.  This should be removed once that flaw has
+     * been addressed.
+     */
+    apr_pool_clear(ptrans);
     clean_child_exit(0);
 }