You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mt...@apache.org on 2004/10/14 18:00:41 UTC
cvs commit: httpd-2.0/modules/proxy mod_proxy.c
mturk 2004/10/14 09:00:41
Modified: modules/proxy mod_proxy.c
Log:
Merge the proxy_status too. Thanks to Christian von Rouques for the patch.
Revision Changes Path
1.151 +1 -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.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- mod_proxy.c 29 Sep 2004 19:07:47 -0000 1.150
+++ mod_proxy.c 14 Oct 2004 16:00:41 -0000 1.151
@@ -825,6 +825,7 @@
ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host;
ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout;
ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt;
+ ps->proxy_status = (overrides->proxy_status_set == 0) ? base->proxy_status : overrides->proxy_status;
ps->pool = p;
return ps;
}