From 755fc20b6ec87c0c7c000afea8b24a9720ea3bb9 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 14 Dec 2012 14:20:26 +0000 Subject: [PATCH] be consistent git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421882 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 435a482223..7f2992c146 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -1218,7 +1218,7 @@ static void * merge_proxy_config(apr_pool_t *p, void *basev, void *overridesv) ps->bgrowth_set = overrides->bgrowth_set || base->bgrowth_set; ps->max_balancers = overrides->max_balancers || base->max_balancers; ps->bal_persist = overrides->bal_persist; - ps->inherit = (base->inherit || overrides->inherit); + ps->inherit = overrides->inherit || base->inherit; ps->recv_buffer_size = (overrides->recv_buffer_size_set == 0) ? base->recv_buffer_size : overrides->recv_buffer_size; ps->recv_buffer_size_set = overrides->recv_buffer_size_set || base->recv_buffer_size_set; ps->io_buffer_size = (overrides->io_buffer_size_set == 0) ? base->io_buffer_size : overrides->io_buffer_size; -- 2.40.0