PR:

Obtained from:
Submitted by:	Daniel Lopez <daniel@covalent.net>
Reviewed by:	dougm, rbb
add optional fixup hook to proxy

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94544 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 38990c537176b6f1d653552f3ae0d75a34b4a754..e08d77a339d64036ef027ef5822811e5e9bcb36f 100644 (file)
--- 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 a76987834806598251c124be56a939ede90e5a4b..9664ba1a3546149e507fdfd568d9f90d90595d80 100644 (file)
--- 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 4caa93b3c0f8a1cc08e3aaccb290a90b4d6433b6..e560e984938442bb77447fa4d5afab240cd376df 100644 (file)
--- 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 52437041ebe78518bd1d28613b0dee3116c366cc..eff26563b4e31cd2fdfe5e21f319e03cca7c034b 100644 (file)
--- 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++) {