iliaa Sat Sep 21 11:42:33 2002 EDT
Modified files:
/php4/sapi/apache mod_php4.c
Log:
Fixed bug #15038, original patch by: [EMAIL PROTECTED]
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.142 php4/sapi/apache/mod_php4.c:1.143
--- php4/sapi/apache/mod_php4.c:1.142 Wed Sep 18 17:57:30 2002
+++ php4/sapi/apache/mod_php4.c Sat Sep 21 11:42:33 2002
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.142 2002/09/18 21:57:30 zeev Exp $ */
+/* $Id: mod_php4.c,v 1.143 2002/09/21 15:42:33 iliaa Exp $ */
#include "php_apache_http.h"
@@ -186,8 +186,10 @@
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 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
