summaryrefslogtreecommitdiffstats
path: root/modules/proxy
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2015-05-11 17:26:13 +0200
committerYann Ylavic <ylavic@apache.org>2015-05-11 17:26:13 +0200
commitff720d0f56ee8f3dca7953938eed2d183e320969 (patch)
tree1a6547b6e9c18e378327854f9977833feaf08b0f /modules/proxy
parentmod_proxy: only cleanup the socket for a connection asked to be closed but (diff)
downloadapache2-ff720d0f56ee8f3dca7953938eed2d183e320969.tar.xz
apache2-ff720d0f56ee8f3dca7953938eed2d183e320969.zip
mod_proxy: check for the correct pool (lifetime) in connection_cleanup(),
according to the associated comment and the value really NULLed in conn_pool_cleanup(). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678768 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--modules/proxy/proxy_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 61ba1d19bd..2b6e4c4f81 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1368,7 +1368,7 @@ static apr_status_t connection_cleanup(void *theconn)
* If the connection pool is NULL the worker
* cleanup has been run. Just return.
*/
- if (!worker->cp) {
+ if (!worker->cp->pool) {
return APR_SUCCESS;
}