svn commit: r1421288 - /httpd/httpd/trunk/modules/proxy/mod_proxy.c

[ji...@apache.org]

Author: jim
Date: Thu Dec 13 13:36:08 2012
New Revision: 1421288

URL: http://svn.apache.org/viewvc?rev=1421288&view=rev
Log:
inherit inherit

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=1421288&r1=1421287&r2=1421288&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Thu Dec 13 13:36:08 2012
@@ -1218,7 +1218,7 @@ static void * merge_proxy_config(apr_poo
     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;