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

be consistent

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421882 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2012-12-14 14:20:26 +00:00
parent bdafd4e926
commit 755fc20b6e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/proxy/mod_proxy.c
View File

@@ -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;