www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Fix the "merge" behaviour of the ProxyErrorOverride directive.

Browse Source 
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
This commit is contained in:
Graham Leggett
2001-09-28 10:33:39 +00:00
parent 0617f1c78f
commit 3ce4f34fd4
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/proxy/mod_proxy.c
View File

@@ -483,6 +483,7 @@ static void * create_proxy_config(apr_pool_t *p, server_rec *s)
ps->maxfwd = DEFAULT_MAX_FORWARDS; ps->maxfwd = DEFAULT_MAX_FORWARDS;
ps->maxfwd_set = 0; ps->maxfwd_set = 0;
ps->error_override = 0; ps->error_override = 0;
ps->error_override_set = 0;
return ps; 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->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->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->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; return ps;
} }
@@ -767,6 +769,7 @@ static const char *
ap_get_module_config(parms->server->module_config, &proxy_module); ap_get_module_config(parms->server->module_config, &proxy_module);
psf->error_override = flag; psf->error_override = flag;
psf->error_override_set = 1;
return NULL; return NULL;
} }

1
modules/proxy/mod_proxy.h
View File

@@ -186,6 +186,7 @@ typedef struct {
* returned from the rest of the system * returned from the rest of the system
*/ */
int error_override; int error_override;
int error_override_set;
} proxy_server_conf; } proxy_server_conf;