mod_headers: Allow % at the end of a Header value. PR 36609.

(Backport of r490156, r499567)

Reviewed by: niq, rpluem, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539271 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 1d4fca1e2410d3df8fdcbbab56784f7fbc81e095..e97077ffeed3ed4613d2f7790fab2504f13ef9ae 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.5
 
+  *) mod_headers: Allow % at the end of a Header value.  PR 36609.
+     [Nick Kew, Ruediger Pluem]
+
   *) mod_cache: Use the same cache key throughout the whole request processing
      to handle escaped URLs correctly.  PR 41475. [Ruediger Pluem]
 

diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
index 34174a1809c943f784b13ef4bb4bf11fc957ac5a..e139b5db9f31021603a67f3952cd33165e584759 100644 (file)
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -305,11 +305,13 @@ static char *parse_format_tag(apr_pool_t *p, format_tag *tag, const char **sa)
     }
     s++; /* skip the % */
 
-    /* Pass through %% as % */
-    if (*s == '%') {
+    /* Pass through %% or % at end of string as % */
+    if ((*s == '%') || (*s == '\0')) {
         tag->func = constant_item;
         tag->arg = "%";
-        *sa = ++s;
+        if (*s)
+            s++;
+        *sa = s;
         return NULL;
     }