www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

revert... we are good

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483188 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2013-05-16 04:02:38 +00:00
parent 3919a404e3
commit 66b3e65e76
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/proxy/mod_proxy.c
View File

@@ -38,7 +38,6 @@ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup,
static const char * const proxy_id = "proxy"; static const char * const proxy_id = "proxy";
apr_global_mutex_t *proxy_mutex = NULL; apr_global_mutex_t *proxy_mutex = NULL;
apr_pool_t *proxy_subpool = NULL;
/* /*
* A Web proxy module. Stages: * A Web proxy module. Stages:
@@ -1197,7 +1196,7 @@ static void * create_proxy_config(apr_pool_t *p, server_rec *s)
ps->badopt_set = 0; ps->badopt_set = 0;
ps->source_address = NULL; ps->source_address = NULL;
ps->source_address_set = 0; ps->source_address_set = 0;
ps->pool = proxy_subpool; apr_pool_create_ex(&ps->pool, p, NULL, NULL);
return ps; return ps;
} }
@@ -1259,7 +1258,7 @@ static void * merge_proxy_config(apr_pool_t *p, void *basev, void *overridesv)
ps->proxy_status_set = overrides->proxy_status_set || base->proxy_status_set; 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 = (overrides->source_address_set == 0) ? base->source_address : overrides->source_address;
ps->source_address_set = overrides->source_address_set || base->source_address_set; ps->source_address_set = overrides->source_address_set || base->source_address_set;
ps->pool = proxy_subpool; ps->pool = base->pool;
return ps; return ps;
} }
static const char *set_source_address(cmd_parms *parms, void *dummy, static const char *set_source_address(cmd_parms *parms, void *dummy,
@@ -2585,8 +2584,6 @@ static int proxy_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
return 500; /* An HTTP status would be a misnomer! */ 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_OPTIONAL_HOOK(ap, status_hook, proxy_status_hook, NULL, NULL,
APR_HOOK_MIDDLE); APR_HOOK_MIDDLE);
/* Reset workers count on gracefull restart */ /* Reset workers count on gracefull restart */