Commit 3e9640b6 authored by Graham Leggett's avatar Graham Leggett
Browse files

Fix the "merge" behaviour of the ProxyErrorOverride directive. 

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91172 13f79535-47bb-0310-9956-ffa450edef68
parent c0d87108

modules/proxy/mod_proxy.c

+3 −0
Original line number Diff line number Diff line
@@ -483,6 +483,7 @@ static void * create_proxy_config(apr_pool_t *p, server_rec *s) 
    ps->maxfwd = DEFAULT_MAX_FORWARDS;

    ps->maxfwd_set = 0;

    ps->error_override = 0; 

    ps->error_override_set = 0; 

    return ps;

}
@@ -505,6 +506,7 @@ static void * merge_proxy_config(apr_pool_t *p, void *basev, void *overridesv) 
    ps->req = (overrides->req_set == 0) ? base->req : overrides->req;

    ps->recv_buffer_size = (overrides->recv_buffer_size_set == 0) ? base->recv_buffer_size : overrides->recv_buffer_size;

    ps->maxfwd = (overrides->maxfwd_set == 0) ? base->maxfwd : overrides->maxfwd;

    ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override;



    return ps;

}
@@ -767,6 +769,7 @@ static const char * 
    ap_get_module_config(parms->server->module_config, &proxy_module);



    psf->error_override = flag;

    psf->error_override_set = 1;

    return NULL;

}

modules/proxy/mod_proxy.h

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ typedef struct { 
     * returned from the rest of the system 

     */

    int error_override;

    int error_override_set;



} proxy_server_conf;