Propagate the handler name to the action script via

the REDIRECT_HANDLER environment variable.

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

diff --git a/CHANGES b/CHANGES
index 419708864162a17c7b5ec989cf5de259ac75dba6..5ab527e42c1f19ee96a8ff46b65179935b75aa6a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_actions: Propagate the handler name to the action script via
+     the REDIRECT_HANDLER environment variable.  [André Malo]
+
   *) mod_ext_filter: Set additional environment variables for use by
      the external filter.  PR 20944.  [Andrew Ho, Jeff Trawick]
 

diff --git a/modules/mappers/mod_actions.c b/modules/mappers/mod_actions.c
index 0eef6c782235ebddd30a9d98c14965295ce73998..55d6e65e1c32c1367519c676b4dadd025fd6e5d6 100644 (file)
--- a/modules/mappers/mod_actions.c
+++ b/modules/mappers/mod_actions.c
@@ -228,6 +228,10 @@ static int action_handler(request_rec *r)
         }
 
         script = t;
+        /* propagate the handler name to the script
+         * (will be REDIRECT_HANDLER there)
+         */
+        apr_table_setn(r->subprocess_env, "HANDLER", action);
     }
 
     if (script == NULL)

diff --git a/support/suexec.c b/support/suexec.c
index d2ad691a18d8a94be7275ba9a675c536f82ecbc6..198dd996dc5af9557f476ffa70e7153da2e2b283 100644 (file)
--- a/support/suexec.c
+++ b/support/suexec.c
@@ -158,6 +158,7 @@ char *safe_env_lst[] =
     "REMOTE_IDENT=",
     "REMOTE_PORT=",
     "REMOTE_USER=",
+    "REDIRECT_HANDLER=",
     "REDIRECT_QUERY_STRING=",
     "REDIRECT_STATUS=",
     "REDIRECT_URL=",