Fixed bug #15038, original patch by: phpman@toowards.com

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index bbc95fb7ed7769ffa6722ea60f33d9ce437c2d34..59732fd860ef8053452741613e7b8d7727ae65d8 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -186,8 +186,10 @@ static int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_head
                r->content_type = pstrdup(r->pool, header_content);
        } else if (!strcasecmp(header_name, "Set-Cookie")) {
                table_add(r->headers_out, header_name, header_content);
-       } else {
+       } else if (sapi_header->replace) {
                table_set(r->headers_out, header_name, header_content);
+       } else {
+               table_add(r->headers_out, header_name, header_content);
        }
 
        *p = ':';  /* a well behaved header handler shouldn't change its original arguments */