View | Details | Raw Unified | Return to bug 11540
Collapse All | Expand All

(-)modules/proxy/mod_proxy.c.orig (+10 lines)
Lines 894-908 Link Here
894
894
895
    ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain;
895
    ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain;
896
    ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt;
896
    ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt;
897
    ps->viaopt_set = overrides->viaopt_set || base->viaopt_set;
897
    ps->req = (overrides->req_set == 0) ? base->req : overrides->req;
898
    ps->req = (overrides->req_set == 0) ? base->req : overrides->req;
899
    ps->req_set = overrides->req_set || base->req_set;
898
    ps->recv_buffer_size = (overrides->recv_buffer_size_set == 0) ? base->recv_buffer_size : overrides->recv_buffer_size;
900
    ps->recv_buffer_size = (overrides->recv_buffer_size_set == 0) ? base->recv_buffer_size : overrides->recv_buffer_size;
901
    ps->recv_buffer_size_set = overrides->recv_buffer_size_set || base->recv_buffer_size_set;
899
    ps->io_buffer_size = (overrides->io_buffer_size_set == 0) ? base->io_buffer_size : overrides->io_buffer_size;
902
    ps->io_buffer_size = (overrides->io_buffer_size_set == 0) ? base->io_buffer_size : overrides->io_buffer_size;
903
    ps->io_buffer_size_set = overrides->io_buffer_size_set || base->io_buffer_size_set;
900
    ps->maxfwd = (overrides->maxfwd_set == 0) ? base->maxfwd : overrides->maxfwd;
904
    ps->maxfwd = (overrides->maxfwd_set == 0) ? base->maxfwd : overrides->maxfwd;
905
    ps->maxfwd_set = overrides->maxfwd_set || base->maxfwd_set;
901
    ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override;
906
    ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override;
907
    ps->error_override_set = overrides->error_override_set || base->error_override_set;
902
    ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host;
908
    ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host;
909
    ps->preserve_host_set = overrides->preserve_host_set || base->preserve_host_set;
903
    ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout;
910
    ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout;
911
    ps->timeout_set = overrides->timeout_set || base->timeout_set;
904
    ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt;
912
    ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt;
913
    ps->badopt_set = overrides->badopt_set || base->badopt_set;
905
    ps->proxy_status = (overrides->proxy_status_set == 0) ? base->proxy_status : overrides->proxy_status;
914
    ps->proxy_status = (overrides->proxy_status_set == 0) ? base->proxy_status : overrides->proxy_status;
915
    ps->proxy_status_set = overrides->proxy_status_set || base->proxy_status_set;
906
    ps->pool = p;
916
    ps->pool = p;
907
    return ps;
917
    return ps;
908
}
918
}

Return to bug 11540