From f648ac64944f276b499cc551e86f50a4098e1750 Mon Sep 17 00:00:00 2001 From: Mladen Turk Date: Thu, 14 Oct 2004 16:00:41 +0000 Subject: [PATCH] Merge the proxy_status too. Thanks to Christian von Rouques for the patch. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105457 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 58bf73c8394..01d804f919e 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -825,6 +825,7 @@ static void * merge_proxy_config(apr_pool_t *p, void *basev, void *overridesv) ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host; ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout; ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt; + ps->proxy_status = (overrides->proxy_status_set == 0) ? base->proxy_status : overrides->proxy_status; ps->pool = p; return ps; } -- 2.47.2