From: Mladen Turk <mturk@apache.org>
Date: Sat, 16 Oct 2004 06:52:35 +0000 (+0000)
Subject: Do not use reslist if it wasn't created. This fixes cases on prefork with
X-Git-Tag: 2.1.1~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d19ff8597ff624fa6537218482720edba0fed008;p=thirdparty%2Fapache%2Fhttpd.git

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

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 5c77f48fff6..ad01289946b 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