don't segfault, when setting an empty header value

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

diff --git a/CHANGES b/CHANGES
index 309892a265727bdd61d92b8b5a386d9a0af077c9..085dc5a83cda8f38aa857a4660166630e4b91069 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_headers no longer crashes if an empty header value should
+     be added.  [André Malo]
+
   *) mod_cgi: Handle output on stderr during script execution on Unix
      platforms; preventing deadlock when stderr output fills pipe buffer.
      PR 22030.  [Joe Orton, Jeff Trawick]

diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
index d20f57bcbd06d37389a0be003863fe740405d653..ec2fa2873fb4071a83966cbcfbf7cc8cb236359b 100644 (file)
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -474,7 +474,7 @@ static char* process_tags(header_entry *hdr, request_rec *r)
         else
             str = apr_pstrcat(r->pool, str, s, NULL);
     }
-    return str;
+    return str ? str : "";
 }
 
 static int echo_header(echo_do *v, const char *key, const char *val)