summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMladen Turk <mturk@apache.org>2004-10-16 08:52:35 +0200
committerMladen Turk <mturk@apache.org>2004-10-16 08:52:35 +0200
commitd19ff8597ff624fa6537218482720edba0fed008 (patch)
tree93ab10c53e69921711e5045ec98b18e60a69d8b2 /modules
parentupdate transformation (diff)
downloadapache2-d19ff8597ff624fa6537218482720edba0fed008.tar.xz
apache2-d19ff8597ff624fa6537218482720edba0fed008.zip
Do not use reslist if it wasn't created. This fixes cases on prefork with
threads enabled and hmax set. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105480 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
-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 5c77f48fff..ad01289946 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1507,7 +1507,7 @@ PROXY_DECLARE(int) ap_proxy_acquire_connection(const char *proxy_function,
}
}
#if APR_HAS_THREADS
- if (worker->hmax) {
+ if (worker->hmax && worker->cp->res) {
rv = apr_reslist_acquire(worker->cp->res, (void **)conn);
}
else