Sorry for top-post... jorton, was the commentary satisfactory?
On 10/11/2010 11:21 PM, wr...@apache.org wrote: > Author: wrowe > Date: Tue Oct 12 04:21:28 2010 > New Revision: 1021621 > > URL: http://svn.apache.org/viewvc?rev=1021621&view=rev > Log: > 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 > > > Modified: > httpd/httpd/branches/2.2.x/CHANGES > httpd/httpd/branches/2.2.x/STATUS > httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c > > Modified: httpd/httpd/branches/2.2.x/CHANGES > URL: > http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1021621&r1=1021620&r2=1021621&view=diff > ============================================================================== > --- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original) > +++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Oct 12 04:21:28 2010 > @@ -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 > > Modified: httpd/httpd/branches/2.2.x/STATUS > URL: > http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1021621&r1=1021620&r2=1021621&view=diff > ============================================================================== > --- httpd/httpd/branches/2.2.x/STATUS (original) > +++ httpd/httpd/branches/2.2.x/STATUS Tue Oct 12 04:21:28 2010 > @@ -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/d...@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.ga5...@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 > > Modified: httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c > URL: > http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c?rev=1021621&r1=1021620&r2=1021621&view=diff > ============================================================================== > --- httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c (original) > +++ httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c Tue Oct 12 > 04:21:28 2010 > @@ -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); > } > > > >
