You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2001/09/28 12:33:39 UTC
cvs commit: httpd-2.0/modules/proxy mod_proxy.c mod_proxy.h
minfrin 01/09/28 03:33:39
Modified: modules/proxy mod_proxy.c mod_proxy.h
Log:
Fix the "merge" behaviour of the ProxyErrorOverride directive.
Revision Changes Path
1.59 +3 -0 httpd-2.0/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mod_proxy.c 2001/09/28 10:23:32 1.58
+++ mod_proxy.c 2001/09/28 10:33:39 1.59
@@ -483,6 +483,7 @@
ps->maxfwd = DEFAULT_MAX_FORWARDS;
ps->maxfwd_set = 0;
ps->error_override = 0;
+ ps->error_override_set = 0;
return ps;
}
@@ -505,6 +506,7 @@
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 @@
ap_get_module_config(parms->server->module_config, &proxy_module);
psf->error_override = flag;
+ psf->error_override_set = 1;
return NULL;
}
1.63 +1 -0 httpd-2.0/modules/proxy/mod_proxy.h
Index: mod_proxy.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- mod_proxy.h 2001/09/28 10:23:32 1.62
+++ mod_proxy.h 2001/09/28 10:33:39 1.63
@@ -186,6 +186,7 @@
* returned from the rest of the system
*/
int error_override;
+ int error_override_set;
} proxy_server_conf;