On 10/20/2010 08:33 PM, minf...@apache.org wrote: > Author: minfrin > Date: Wed Oct 20 18:33:55 2010 > New Revision: 1025666 > > URL: http://svn.apache.org/viewvc?rev=1025666&view=rev > Log: > mod_proxy: Move the ProxyErrorOverride directive to have per directory scope. > > Modified: > httpd/httpd/trunk/CHANGES > httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml > httpd/httpd/trunk/modules/proxy/mod_proxy.c > httpd/httpd/trunk/modules/proxy/mod_proxy.h > httpd/httpd/trunk/modules/proxy/mod_proxy_http.c >
> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1025666&r1=1025665&r2=1025666&view=diff > ============================================================================== > --- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original) > +++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Wed Oct 20 18:33:55 2010 mod_proxy.h is public. Doesn't this require a bump? > @@ -146,15 +146,6 @@ typedef struct { > apr_size_t io_buffer_size; > long maxfwd; > apr_interval_time_t timeout; > - /** > - * the following setting masks the error page > - * returned from the 'proxied server' and just > - * forwards the status code upwards. > - * This allows the main server (us) to generate > - * the error page, (so it will look like a error > - * returned from the rest of the system > - */ > - int error_override; > enum { > bad_error, > bad_ignore, > @@ -172,7 +163,6 @@ typedef struct { > char io_buffer_size_set; > char maxfwd_set; > char timeout_set; > - char error_override_set; > char badopt_set; > char proxy_status_set; > } proxy_server_conf; > @@ -195,10 +185,20 @@ typedef struct { > const apr_strmatch_pattern* cookie_path_str; > const apr_strmatch_pattern* cookie_domain_str; > > + /** > + * the following setting masks the error page > + * returned from the 'proxied server' and just > + * forwards the status code upwards. > + * This allows the main server (us) to generate > + * the error page, (so it will look like a error > + * returned from the rest of the system > + */ > + int error_override; > signed char p_is_fnmatch; /* Is the path an fnmatch candidate? */ > signed char interpolate_env; > signed char preserve_host; > signed char preserve_host_set; > + int error_override_set:1; > } proxy_dir_conf; > > /* if we interpolate env vars per-request, we'll need a per-request > Regards Rüdiger
