From a6f1533789b897d3b8930b437164e81e0a0f4c72 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sat, 21 Jul 2012 02:56:28 +0800 Subject: Fixed bug #55544 (ob_gzhandler always conflicts with zlib.output_compression) --- ext/zlib/php_zlib.h | 1 + 1 file changed, 1 insertion(+) (limited to 'ext/zlib/php_zlib.h') diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index 3d8c90cbf5..449dfed062 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -52,6 +52,7 @@ ZEND_BEGIN_MODULE_GLOBALS(zlib) int compression_coding; long output_compression; long output_compression_level; + long output_compression_default; char *output_handler; php_zlib_context *ob_gzhandler; ZEND_END_MODULE_GLOBALS(zlib); -- cgit v1.2.1 From 4c1e2bbd6f744b4048d4e0540ecc5dbe005494fe Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Tue, 24 Jul 2012 14:43:53 +0800 Subject: Re-fix bug #55544 --- ext/zlib/php_zlib.h | 1 + 1 file changed, 1 insertion(+) (limited to 'ext/zlib/php_zlib.h') diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index 449dfed062..ab673512fc 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -55,6 +55,7 @@ ZEND_BEGIN_MODULE_GLOBALS(zlib) long output_compression_default; char *output_handler; php_zlib_context *ob_gzhandler; + zend_bool handler_registered; ZEND_END_MODULE_GLOBALS(zlib); php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC); -- cgit v1.2.1 From 9fe8c58130ac82d2b52b35a290b71569abe50d18 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Tue, 24 Jul 2012 14:45:13 +0800 Subject: binary compatibility --- ext/zlib/php_zlib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/zlib/php_zlib.h') diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index ab673512fc..e895e0e482 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -52,9 +52,9 @@ ZEND_BEGIN_MODULE_GLOBALS(zlib) int compression_coding; long output_compression; long output_compression_level; - long output_compression_default; char *output_handler; php_zlib_context *ob_gzhandler; + long output_compression_default; zend_bool handler_registered; ZEND_END_MODULE_GLOBALS(zlib); -- cgit v1.2.1