diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -16,6 +16,7 @@ PHP 4 NEWS 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). diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index ac59b2c90d..8e4db82451 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -980,7 +980,7 @@ PHP_FUNCTION(ob_gzhandler) 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 @@ PHP_FUNCTION(ob_gzhandler) 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; |