summaryrefslogtreecommitdiff
path: root/sapi/apache/mod_php4.c
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2002-09-21 15:42:33 +0000
committerIlia Alshanetsky <iliaa@php.net>2002-09-21 15:42:33 +0000
commitfd094b5b1e39e959353bfb43676d06d2ad0204f6 (patch)
treeb8a9fb8af19a06056f551855bf4be190385a7ae2 /sapi/apache/mod_php4.c
parent78f3ad40a890703fb5ac792d725ed09927e3e3b8 (diff)
downloadphp-git-fd094b5b1e39e959353bfb43676d06d2ad0204f6.tar.gz
Fixed bug #15038, original patch by: phpman@toowards.com
Diffstat (limited to 'sapi/apache/mod_php4.c')
-rw-r--r--sapi/apache/mod_php4.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index bbc95fb7ed..59732fd860 100644
--- 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 */