Commit 3e62e576 authored by Mladen Turk's avatar Mladen Turk
Browse files

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
parent 83217b8d

modules/proxy/mod_proxy.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

}