You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/05/16 05:06:14 UTC
svn commit: r1483176 - /httpd/httpd/trunk/modules/proxy/mod_proxy.c
Author: jim
Date: Thu May 16 03:06:14 2013
New Revision: 1483176
URL: http://svn.apache.org/r1483176
Log:
force subpool
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1483176&r1=1483175&r2=1483176&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Thu May 16 03:06:14 2013
@@ -38,6 +38,7 @@ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_
static const char * const proxy_id = "proxy";
apr_global_mutex_t *proxy_mutex = NULL;
+apr_pool_t *proxy_subpool = NULL;
/*
* A Web proxy module. Stages:
@@ -1196,7 +1197,7 @@ static void * create_proxy_config(apr_po
ps->badopt_set = 0;
ps->source_address = NULL;
ps->source_address_set = 0;
- apr_pool_create_ex(&ps->pool, p, NULL, NULL);
+ ps->pool = proxy_subpool;
return ps;
}
@@ -1258,7 +1259,7 @@ static void * merge_proxy_config(apr_poo
ps->proxy_status_set = overrides->proxy_status_set || base->proxy_status_set;
ps->source_address = (overrides->source_address_set == 0) ? base->source_address : overrides->source_address;
ps->source_address_set = overrides->source_address_set || base->source_address_set;
- ps->pool = base->pool;
+ ps->pool = proxy_subpool;
return ps;
}
static const char *set_source_address(cmd_parms *parms, void *dummy,
@@ -2584,6 +2585,8 @@ static int proxy_pre_config(apr_pool_t *
return 500; /* An HTTP status would be a misnomer! */
}
+ apr_pool_create(&proxy_subpool, pconf);
+ apr_pool_tag(proxy_subpool, "proxy_pconf_subpool");
APR_OPTIONAL_HOOK(ap, status_hook, proxy_status_hook, NULL, NULL,
APR_HOOK_MIDDLE);
/* Reset workers count on gracefull restart */