iliaa Sun Jul 27 14:16:47 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/zlib zlib.c
/php-src NEWS
Log:
MFH: Fixed bug #24827 (ob_gzhandler overrides Vary header)
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.153.2.10 php-src/ext/zlib/zlib.c:1.153.2.11
--- php-src/ext/zlib/zlib.c:1.153.2.10 Wed May 21 13:00:57 2003
+++ php-src/ext/zlib/zlib.c Sun Jul 27 14:16:47 2003
@@ -18,7 +18,7 @@
| Jade Nicoletti <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.153.2.10 2003/05/21 17:00:57 rasmus Exp $ */
+/* $Id: zlib.c,v 1.153.2.11 2003/07/27 18:16:47 iliaa Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -980,7 +980,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;
@@ -988,7 +988,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, 0, 0 TSRMLS_CC)==FAILURE) {
return_original = 1;
}
break;
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.305 php-src/NEWS:1.1247.2.306
--- php-src/NEWS:1.1247.2.305 Fri Jul 25 05:47:06 2003
+++ php-src/NEWS Sun Jul 27 14:16:47 2003
@@ -16,6 +16,7 @@
is used for background color. (Pierre-Alain Joye)
- Fixed a bug that under certain circumstances could invalidate safe_mode.
(Ilia)
+- Fixed bug #24827 (ob_gzhandler overrides Vary header). (Ilia)
- Fixed bug #24783 (foreach($ar as $key => $val), $key not binary safe). (Zeev)
- Fixed bug #24760 (non-default SNMP port number not working). (Jani)
- Fixed bug #24752 (Unhandled "uniqueidentifier" field type).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
