From: Jim Jagielski <jim@apache.org>
Date: Fri, 15 Aug 2008 22:02:52 +0000 (+0000)
Subject: Merge r682369 from trunk:
X-Git-Tag: 2.2.10~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e72ef8a96937d64e38a423210560c03501169529;p=thirdparty%2Fapache%2Fhttpd.git

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


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

diff --git a/STATUS b/STATUS
index 7244e2c7e2f..3b38fb8cf5b 100644
--- a/STATUS
+++ b/STATUS
@@ -130,16 +130,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       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 ]
 
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index e8309e463f2..6b3b13a3387 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1377,7 +1377,6 @@ static apr_status_t conn_pool_cleanup(void *theworker)
     proxy_worker *worker = (proxy_worker *)theworker;
     if (worker->cp->res) {
         worker->cp->pool = NULL;
-        apr_reslist_destroy(worker->cp->res);
     }
     return APR_SUCCESS;
 }