1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

* 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@682369 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ruediger Pluem
2008-08-04 12:53:50 +00:00
parent 5c5dc84112
commit f18219717d

View File

@@ -1380,7 +1380,6 @@ static apr_status_t conn_pool_cleanup(void *theworker)
proxy_worker *worker = (proxy_worker *)theworker; proxy_worker *worker = (proxy_worker *)theworker;
if (worker->cp->res) { if (worker->cp->res) {
worker->cp->pool = NULL; worker->cp->pool = NULL;
apr_reslist_destroy(worker->cp->res);
} }
return APR_SUCCESS; return APR_SUCCESS;
} }