From 317eca45401485e38ed7fc750c5e8f34d70f5eec Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 21 Feb 2013 13:19:30 +0000 Subject: [PATCH] realign and fix logic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1448630 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy.c | 2 +- modules/proxy/mod_proxy.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 8c5f94271e..5a44b67727 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -1206,7 +1206,7 @@ static void * merge_proxy_config(apr_pool_t *p, void *basev, void *overridesv) ps->aliases = apr_array_append(p, base->aliases, overrides->aliases); ps->noproxies = apr_array_append(p, base->noproxies, overrides->noproxies); ps->dirconn = apr_array_append(p, base->dirconn, overrides->dirconn); - if (ps->inherit && ps->ppinherit) { + if (ps->inherit || ps->ppinherit) { ps->workers = apr_array_append(p, base->workers, overrides->workers); ps->balancers = apr_array_append(p, base->balancers, overrides->balancers); } diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index 06f2de2110..70e0c7b295 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -178,9 +178,9 @@ typedef struct { unsigned int proxy_status_set:1; unsigned int source_address_set:1; unsigned int bgrowth_set:1; + unsigned int bal_persist:1; unsigned int inherit:1; unsigned int inherit_set:1; - unsigned int bal_persist:1; unsigned int ppinherit:1; unsigned int ppinherit_set:1; } proxy_server_conf; -- 2.40.0