From: Jim Jagielski <jim@apache.org>
Date: Mon, 14 Oct 2013 16:38:52 +0000 (+0000)
Subject: check that we have a pool...
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc92839256b16c7b8f065caf522e88ef6f04ec7f;p=thirdparty%2Fapache%2Fhttpd.git

check that we have a pool...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531971 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index cd8102fa59d..a02af850e81 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1498,7 +1498,11 @@ PROXY_DECLARE(char *) ap_proxy_worker_name(apr_pool_t *p,
     }
     if (!pool) {
         /* ugly */
-        apr_pool_create(&pool, NULL);
+        apr_pool_create(&pool, ap_server_conf->process->pool);
+        if (!pool) {
+            /* something is better than nothing :) */
+            return worker->s->name;
+        }
     }
     rv = apr_uri_parse(pool, worker->s->name, &uri);
     if (rv != APR_SUCCESS) {