cvs: php-src /ext/zlib zlib.c
| From: | Ilia Alshanetsky | Date: | Sun, 27 Jul 2003 18:16:06 +0000 |
| Subject: | cvs: php-src /ext/zlib zlib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-22815@lists.php.net to get a copy of this message | ||
iliaa Sun Jul 27 14:16:06 2003 EDT
Modified files:
/php-src/ext/zlib zlib.c
Log:
Fixed bug #24827 (ob_gzhandler overrides Vary header)
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.172 php-src/ext/zlib/zlib.c:1.173
--- php-src/ext/zlib/zlib.c:1.172 Sat Jul 19 15:23:33 2003
+++ php-src/ext/zlib/zlib.c Sun Jul 27 14:16:06 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.172 2003/07/19 19:23:33 andrey Exp $ */
+/* $Id: zlib.c,v 1.173 2003/07/27 18:16:06 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -993,7 +993,7 @@
if (sapi_add_header("Content-Encoding: gzip", sizeof("Content-Encoding:
gzip") - 1, 1) == FAILURE) {
return_original = 1;
}
- if (sapi_add_header("Vary: Accept-Encoding", sizeof("Vary:
Accept-Encoding") - 1, 1) == FAILURE) {
+ if (sapi_add_header_ex("Vary: Accept-Encoding", sizeof("Vary:
Accept-Encoding") - 1, 1, 0 TSRMLS_CC)==FAILURE) {
return_original = 1;
}
break;
@@ -1001,7 +1001,7 @@
if (sapi_add_header("Content-Encoding: deflate", sizeof("Content-Encoding:
deflate") - 1, 1) == FAILURE) {
return_original = 1;
}
- if (sapi_add_header("Vary: Accept-Encoding", sizeof("Vary:
Accept-Encoding") - 1, 1) == FAILURE) {
+ if (sapi_add_header_ex("Vary: Accept-Encoding", sizeof("Vary:
Accept-Encoding") - 1, 1, 0 TSRMLS_CC)==FAILURE) {
return_original = 1;
}
break;