]> granicus.if.org Git - apache/commitdiff
check that we have a pool...
authorJim Jagielski <jim@apache.org>
Mon, 14 Oct 2013 16:38:52 +0000 (16:38 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 14 Oct 2013 16:38:52 +0000 (16:38 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531971 13f79535-47bb-0310-9956-ffa450edef68

modules/proxy/proxy_util.c

index cd8102fa59dd83e27771ca0d2b0ada74dd8b3dd7..a02af850e8155a40f104b8e86a3481e2ce827703 100644 (file)
@@ -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) {