summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--modules/proxy/mod_proxy.c3
-rw-r--r--modules/proxy/mod_proxy.h1
-rw-r--r--modules/proxy/proxy_http.c1
4 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 38990c5371..e08d77a339 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
Changes with Apache 2.0.36
+ *) add optional fixup hook to proxy [Daniel Lopez <daniel@covalent.net>]
+
*) Remind the admin about the User and Group directives when we are
unable to set permissions on a semaphore. PR 7812 [Jeff Trawick]
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index a769878348..9664ba1a35 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1124,3 +1124,6 @@ APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(proxy, PROXY, int, scheme_handler,
APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(proxy, PROXY, int, canon_handler,
(request_rec *r, char *url),(r,
url),DECLINED)
+APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(proxy, PROXY, int, fixups,
+ (request_rec *r), (r),
+ OK, DECLINED)
diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 4caa93b3c0..e560e98493 100644
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -247,6 +247,7 @@ APR_DECLARE_EXTERNAL_HOOK(proxy, PROXY, int, canon_handler, (request_rec *r,
char *url))
APR_DECLARE_EXTERNAL_HOOK(proxy, PROXY, int, create_req, (request_rec *r, request_rec *pr))
+APR_DECLARE_EXTERNAL_HOOK(proxy, PROXY, int, fixups, (request_rec *r))
/* proxy_util.c */
diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 52437041eb..eff26563b4 100644
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -547,6 +547,7 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r,
}
/* send request headers */
+ proxy_run_fixups(r);
headers_in_array = apr_table_elts(r->headers_in);
headers_in = (const apr_table_entry_t *) headers_in_array->elts;
for (counter = 0; counter < headers_in_array->nelts; counter++) {