From: André Malo <nd@apache.org>
Date: Sat, 24 Apr 2004 11:51:07 +0000 (+0000)
Subject: don't segfault, when setting an empty header value
X-Git-Tag: 2.0.50~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6652f843b3025ddeb0973453be53d1816985dde5;p=thirdparty%2Fapache%2Fhttpd.git

don't segfault, when setting an empty header value

Reviewed by: Brad Nicholes, Jeff Trawick


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

diff --git a/CHANGES b/CHANGES
index 38bd99db816..b8bf10aa7f3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.50
 
+  *) mod_headers no longer crashes if an empty header value should
+     be added.  [André Malo]
+
   *) Fix segfault in mod_expires, which occured under certain
      circumstances. PR 28047.  [André Malo]
 
diff --git a/STATUS b/STATUS
index fffa6a81255..4c1182841c0 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/04/24 11:43:01 $]
+Last modified at [$Date: 2004/04/24 11:51:06 $]
 
 Release:
 
@@ -93,10 +93,6 @@ PATCHES TO BACKPORT FROM 2.1
          server/core.c: r1.275
        +1: nd
 
-    *) mod_headers: don't segfault, when supplying an empty header value
-         modules/metadata/mod_headers.c: r1.56
-       +1: nd, bnicholes, trawick
-
     *) mod_headers: Backport ErrorHeader directive (regression from 1.3)
          modules/metadata/mod_headers.c: r1.44, 1.45, 1.51
        +1: nd, trawick
diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
index e5e85904cea..b88c485c30c 100644
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -435,7 +435,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)