From: Jim Jagielski <jim@apache.org>
Date: Thu, 13 Dec 2012 13:36:08 +0000 (+0000)
Subject: inherit inherit
X-Git-Tag: 2.5.0-alpha~6017
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e196d0d0dbc87518c5316981b09d05f8cc1f348b;p=apache

inherit inherit


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421288 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 59026755ae..435a482223 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 = overrides->inherit;
+    ps->inherit = (base->inherit || overrides->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;