|
|
008793 |
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
|
|
|
008793 |
index 7f96aff..5517e08 100644
|
|
|
008793 |
--- a/modules/proxy/mod_proxy.c
|
|
|
008793 |
+++ b/modules/proxy/mod_proxy.c
|
|
|
008793 |
@@ -1118,7 +1118,7 @@ static int proxy_handler(request_rec *r)
|
|
|
008793 |
AP_PROXY_RUN(r, worker, conf, url, attempts);
|
|
|
008793 |
access_status = proxy_run_scheme_handler(r, worker, conf,
|
|
|
008793 |
url, NULL, 0);
|
|
|
008793 |
- if (access_status == OK)
|
|
|
008793 |
+ if (access_status == OK || apr_table_get(r->notes, "proxy-error-override"))
|
|
|
008793 |
break;
|
|
|
008793 |
else if (access_status == HTTP_INTERNAL_SERVER_ERROR) {
|
|
|
008793 |
/* Unrecoverable server error.
|
|
|
008793 |
diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
|
|
|
008793 |
index cf52a7d..380b870 100644
|
|
|
008793 |
--- a/modules/proxy/mod_proxy_ajp.c
|
|
|
008793 |
+++ b/modules/proxy/mod_proxy_ajp.c
|
|
|
008793 |
@@ -636,6 +636,11 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
|
|
|
008793 |
*/
|
|
|
008793 |
rv = r->status;
|
|
|
008793 |
r->status = HTTP_OK;
|
|
|
008793 |
+ /*
|
|
|
008793 |
+ * prevent proxy_handler() from treating this as an
|
|
|
008793 |
+ * internal error.
|
|
|
008793 |
+ */
|
|
|
008793 |
+ apr_table_setn(r->notes, "proxy-error-override", "1");
|
|
|
008793 |
}
|
|
|
008793 |
else {
|
|
|
008793 |
rv = OK;
|
|
|
008793 |
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
|
|
|
008793 |
index 89b5d15..bb5cdf9 100644
|
|
|
008793 |
--- a/modules/proxy/mod_proxy_http.c
|
|
|
008793 |
+++ b/modules/proxy/mod_proxy_http.c
|
|
|
008793 |
@@ -1648,6 +1648,11 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
|
|
|
008793 |
}
|
|
|
008793 |
ap_discard_request_body(backend->r);
|
|
|
008793 |
}
|
|
|
008793 |
+ /*
|
|
|
008793 |
+ * prevent proxy_handler() from treating this as an
|
|
|
008793 |
+ * internal error.
|
|
|
008793 |
+ */
|
|
|
008793 |
+ apr_table_setn(r->notes, "proxy-error-override", "1");
|
|
|
008793 |
return proxy_status;
|
|
|
008793 |
}
|
|
|
008793 |
|