Commit 828478cf authored by Nick Kew's avatar Nick Kew
Browse files

Patch for PR#11540 (submitted by Stuart Children) 


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

modules/proxy/mod_proxy.c

+10 −0
Original line number Diff line number Diff line
@@ -972,15 +972,25 @@ static void * merge_proxy_config(apr_pool_t *p, void *basev, void *overridesv) 


    ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain;

    ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt;

    ps->viaopt_set = overrides->viaopt_set || base->viaopt_set;

    ps->req = (overrides->req_set == 0) ? base->req : overrides->req;

    ps->req_set = overrides->req_set || base->req_set;

    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;

    ps->io_buffer_size_set = overrides->io_buffer_size_set || base->io_buffer_size_set;

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

    ps->maxfwd_set = overrides->maxfwd_set || base->maxfwd_set;

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

    ps->error_override_set = overrides->error_override_set || base->error_override_set;

    ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host;

    ps->preserve_host_set = overrides->preserve_host_set || base->preserve_host_set;

    ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout;

    ps->timeout_set = overrides->timeout_set || base->timeout_set;

    ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt;

    ps->badopt_set = overrides->badopt_set || base->badopt_set;

    ps->proxy_status = (overrides->proxy_status_set == 0) ? base->proxy_status : overrides->proxy_status;

    ps->proxy_status_set = overrides->proxy_status_set || base->proxy_status_set;

    ps->pool = p;

    return ps;

}