svn commit: r1448630 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.c mod_proxy.h

[ji...@apache.org]

Author: jim
Date: Thu Feb 21 13:19:30 2013
New Revision: 1448630

URL: http://svn.apache.org/r1448630
Log:
realign and fix logic

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy.c
    httpd/httpd/trunk/modules/proxy/mod_proxy.h

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1448630&r1=1448629&r2=1448630&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Thu Feb 21 13:19:30 2013
@@ -1206,7 +1206,7 @@ static void * merge_proxy_config(apr_poo
     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);
     }

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1448630&r1=1448629&r2=1448630&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Thu Feb 21 13:19:30 2013
@@ -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;