allow RequestHeader to be conditional

PR: 27951
Basically submitted by: vincent gryzor.com (Vincent Deffontaines)

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

diff --git a/CHANGES b/CHANGES
index fa5a3e668416df5ca3a855044a45f327a63871f6..217dcf497880cf0da824b2094abeb2b3e82d0f7a 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]
 
+  *) Allow RequestHeader directives to be conditional. PR 27951.
+     [Vincent Deffontaines <vincent gryzor.com>, André Malo]
+
   *) Fix segfault in mod_expires, which occured under certain
      circumstances. PR 28047.  [André Malo]
 

diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
index fbcb5041695a1f1a09ea9567a1bdd2190ef2372c..1fe056b513d7c55693e3caf61456d08d369fac9c 100644 (file)
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -424,10 +424,6 @@ static const char *header_inout_cmd(hdr_inout inout, cmd_parms *cmd,
 
     /* Handle the envclause on Header */
     if (envclause != NULL) {
-        if (inout == hdr_in) {
-            return "error: envclause (env=...) only valid on "
-                "Header and ErrorHeader directives";
-        }
         if (strncasecmp(envclause, "env=", 4) != 0) {
             return "error: envclause should be in the form env=envar";
         }
@@ -448,7 +444,7 @@ static const char *header_inout_cmd(hdr_inout inout, cmd_parms *cmd,
     return parse_format_string(cmd->pool, new, value);
 }
 
-/* Handle Header directive */
+/* Handle all (xxx)Header directives */
 static const char *header_cmd(cmd_parms *cmd, void *indirconf,
                               const char *args)
 {
@@ -464,19 +460,11 @@ static const char *header_cmd(cmd_parms *cmd, void *indirconf,
     hdr = ap_getword_conf(cmd->pool, &s);
     val = *s ? ap_getword_conf(cmd->pool, &s) : NULL;
     envclause = *s ? ap_getword_conf(cmd->pool, &s) : NULL;
-    outbl = (cmd->info == NULL) ? hdr_out : hdr_err;
+    outbl = (hdr_inout)cmd->info;
 
     return header_inout_cmd(outbl, cmd, indirconf, action, hdr, val, envclause);
 }
 
-/* handle RequestHeader directive */
-static const char *request_header_cmd(cmd_parms *cmd, void *indirconf,
-                              const char *action, const char *inhdr,
-                              const char *value)
-{
-    return header_inout_cmd(hdr_in, cmd, indirconf, action, inhdr, value, NULL);
-}
-
 /*
  * Process the tags in the format string. Tags may be format specifiers 
  * (%D, %t, etc.), whitespace or text strings. For each tag, run the handler
@@ -680,13 +668,15 @@ static apr_status_t ap_headers_fixup(request_rec *r)
                                         
 static const command_rec headers_cmds[] =
 {
-    AP_INIT_RAW_ARGS("Header", header_cmd, NULL, OR_FILEINFO,
-                   "an action, header and value followed by optional env clause"),
-    AP_INIT_RAW_ARGS("ErrorHeader", header_cmd, "", OR_FILEINFO,
-                     "an action, header and value "
-                     "followed by optional env clause"),
-    AP_INIT_TAKE23("RequestHeader", request_header_cmd, NULL, OR_FILEINFO,
-                   "an action, header and value"),
+    AP_INIT_RAW_ARGS("Header", header_cmd, (void *)hdr_out, OR_FILEINFO,
+                     "an action, header and value followed by optional env "
+                     "clause"),
+    AP_INIT_RAW_ARGS("RequestHeader", header_cmd, (void *)hdr_in, OR_FILEINFO,
+                     "an action, header and value followed by optional env "
+                     "clause"),
+    AP_INIT_RAW_ARGS("ErrorHeader", header_cmd, (void *)hdr_err, OR_FILEINFO,
+                     "an action, header and value followed by optional env "
+                     "clause"),
     {NULL}
 };