svn commit: r686390 - in /httpd/httpd/branches/2.2.x: ./ STATUS docs/ modules/proxy/proxy_util.c support/ab.c support/suexec.c

[ji...@apache.org]

Author: jim
Date: Fri Aug 15 15:02:52 2008
New Revision: 686390

URL: http://svn.apache.org/viewvc?rev=686390&view=rev
Log:
Merge r682369 from trunk:

* Remove call to apr_reslist_destroy. With the latest trunk version of
  apr-util this causes a lock during shutdown as at the point of time we would
  execute apr_reslist_destroy the reslist is already destroyed, because we are
  in a cleanup of the same pool where the reslist registered itself as
  precleanup.
  With apr-util 1.3.x calling apr_reslist_destroy is not really useful and
  needed in this case as we are in a cleanup that was registered against the
  same pool that is used by the reslist. As it was registered *after* the
  reslist was created it just runs *before* the reslist cleanup would run. This
  is somewhat pointless here and we could leave the job of destroying the
  reslist to the reslist cleanup.

Submitted by: rpluem
Reviewed by: jim

Modified:
    httpd/httpd/branches/2.2.x/   (props changed)
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/docs/   (props changed)
    httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
    httpd/httpd/branches/2.2.x/support/ab.c   (props changed)
    httpd/httpd/branches/2.2.x/support/suexec.c   (props changed)

Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /httpd/httpd/trunk:682369

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=686390&r1=686389&r2=686390&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Aug 15 15:02:52 2008
@@ -130,16 +130,6 @@
       http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_cgid.c?r1=682475&r2=682389
     +1: covener, rpluem, jim
 
- * mod_proxy: Remove call to apr_reslist_destroy. With apr-util 1.3.x calling
-   apr_reslist_destroy is not really useful and needed in this case as we are
-   in a cleanup that was registered against the same pool that is used by the
-   reslist.
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?rev=682369&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-   +1: rpluem, mturk, jim
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

Propchange: httpd/httpd/branches/2.2.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 15 15:02:52 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/docs:675610
+/httpd/httpd/trunk/docs:675610,682369

Modified: httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c?rev=686390&r1=686389&r2=686390&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c Fri Aug 15 15:02:52 2008
@@ -1377,7 +1377,6 @@
     proxy_worker *worker = (proxy_worker *)theworker;
     if (worker->cp->res) {
         worker->cp->pool = NULL;
-        apr_reslist_destroy(worker->cp->res);
     }
     return APR_SUCCESS;
 }

Propchange: httpd/httpd/branches/2.2.x/support/ab.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 15 15:02:52 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/support/ab.c:83751-655654,657433
+/httpd/httpd/trunk/support/ab.c:83751-655654,657433,682369

Propchange: httpd/httpd/branches/2.2.x/support/suexec.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 15 15:02:52 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/support/suexec.c:655711
+/httpd/httpd/trunk/support/suexec.c:655711,682369