Index: modules/proxy/mod_proxy_http.c =================================================================== --- modules/proxy/mod_proxy_http.c (revision 1024427) +++ modules/proxy/mod_proxy_http.c (working copy) @@ -1411,7 +1411,10 @@ const char *proxy_status_line = NULL; conn_rec *origin = backend->connection; apr_interval_time_t old_timeout = 0; + proxy_dir_conf *dconf; + dconf = ap_get_module_config(r->per_dir_config, &proxy_module); + int do_100_continue; do_100_continue = (worker->ping_timeout_set @@ -1742,7 +1745,7 @@ * ProxyPassReverse/etc from here to ap_proxy_read_headers */ - if ((proxy_status == 401) && (conf->error_override)) { + if ((proxy_status == 401) && (dconf->error_override)) { const char *buf; const char *wa = "WWW-Authenticate"; if ((buf = apr_table_get(r->headers_out, wa))) { @@ -1779,7 +1782,7 @@ APR_BRIGADE_INSERT_TAIL(bb, e); } /* PR 41646: get HEAD right with ProxyErrorOverride */ - if (ap_is_HTTP_ERROR(r->status) && conf->error_override) { + if (ap_is_HTTP_ERROR(r->status) && dconf->error_override) { /* clear r->status for override error, otherwise ErrorDocument * thinks that this is a recursive error, and doesn't find the * custom error page @@ -1824,7 +1827,7 @@ * if we are overriding the errors, we can't put the content * of the page into the brigade */ - if (!conf->error_override || !ap_is_HTTP_ERROR(proxy_status)) { + if (!dconf->error_override || !ap_is_HTTP_ERROR(proxy_status)) { /* read the body, pass it to the output filters */ apr_read_type_e mode = APR_NONBLOCK_READ; int finish = FALSE; @@ -1834,7 +1837,7 @@ * error status so that an underlying error (eg HTTP_NOT_FOUND) * doesn't become an HTTP_OK. */ - if (conf->error_override && !ap_is_HTTP_ERROR(proxy_status) + if (dconf->error_override && !ap_is_HTTP_ERROR(proxy_status) && ap_is_HTTP_ERROR(original_status)) { r->status = original_status; r->status_line = original_status_line; Index: modules/proxy/mod_proxy.c =================================================================== --- modules/proxy/mod_proxy.c (revision 1024427) +++ modules/proxy/mod_proxy.c (working copy) @@ -1122,8 +1122,6 @@ ps->io_buffer_size_set = 0; ps->maxfwd = DEFAULT_MAX_FORWARDS; ps->maxfwd_set = 0; - ps->error_override = 0; - ps->error_override_set = 0; ps->timeout = 0; ps->timeout_set = 0; ps->badopt = bad_error; @@ -1160,8 +1158,6 @@ ps->io_buffer_size_set = overrides->io_buffer_size_set || base->io_buffer_size_set; ps->maxfwd = (overrides->maxfwd_set == 0) ? base->maxfwd : overrides->maxfwd; ps->maxfwd_set = overrides->maxfwd_set || base->maxfwd_set; - ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override; - ps->error_override_set = overrides->error_override_set || base->error_override_set; ps->timeout = (overrides->timeout_set == 0) ? base->timeout : overrides->timeout; ps->timeout_set = overrides->timeout_set || base->timeout_set; ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt; @@ -1188,6 +1184,8 @@ new->preserve_host_set = 0; new->preserve_host = 0; new->interpolate_env = -1; /* unset */ + new->error_override = 0; + new->error_override_set = 0; return (void *) new; } @@ -1215,6 +1213,9 @@ new->preserve_host = (add->preserve_host_set == 0) ? base->preserve_host : add->preserve_host; new->preserve_host_set = add->preserve_host_set || base->preserve_host_set; + new->error_override = (add->error_override_set == 0) ? base->error_override + : add->error_override; + new->error_override_set = add->error_override_set || base->error_override_set; return new; } @@ -1611,13 +1612,12 @@ } static const char * - set_proxy_error_override(cmd_parms *parms, void *dummy, int flag) + set_proxy_error_override(cmd_parms *parms, void *dconf, int flag) { - proxy_server_conf *psf = - ap_get_module_config(parms->server->module_config, &proxy_module); + proxy_dir_conf *conf = dconf; - psf->error_override = flag; - psf->error_override_set = 1; + conf->error_override = flag; + conf->error_override_set = 1; return NULL; } static const char * @@ -2119,7 +2119,7 @@ "The default intranet domain name (in absence of a domain in the URL)"), AP_INIT_TAKE1("ProxyVia", set_via_opt, NULL, RSRC_CONF, "Configure Via: proxy header header to one of: on | off | block | full"), - AP_INIT_FLAG("ProxyErrorOverride", set_proxy_error_override, NULL, RSRC_CONF, + AP_INIT_FLAG("ProxyErrorOverride", set_proxy_error_override, NULL, RSRC_CONF|ACCESS_CONF, "use our error handling pages instead of the servers' we are proxying"), AP_INIT_FLAG("ProxyPreserveHost", set_preserve_host, NULL, RSRC_CONF|ACCESS_CONF, "on if we should preserve host header while proxying"), Index: modules/proxy/mod_proxy.h =================================================================== --- modules/proxy/mod_proxy.h (revision 1024427) +++ modules/proxy/mod_proxy.h (working copy) @@ -146,15 +146,6 @@ 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 @@ 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 @@ 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