From d13f833875b04368732900341b12c6db031c452b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gustavo=20Andr=C3=A9=20dos=20Santos=20Lopes?= Date: Wed, 7 Mar 2012 08:51:30 +0000 Subject: [PATCH] - Tentative fix for bug #61306. #cjones: Will update NEWS when confirmed it fixes the problem. --- ext/zlib/zlib.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 8d0005592a..d472573b79 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -938,7 +938,6 @@ static PHP_MINIT_FUNCTION(zlib) REGISTER_LONG_CONSTANT("ZLIB_ENCODING_GZIP", PHP_ZLIB_ENCODING_GZIP, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ZLIB_ENCODING_DEFLATE", PHP_ZLIB_ENCODING_DEFLATE, CONST_CS|CONST_PERSISTENT); REGISTER_INI_ENTRIES(); - ZLIBG(ob_gzhandler) = NULL; return SUCCESS; } /* }}} */ @@ -989,6 +988,13 @@ static PHP_MINFO_FUNCTION(zlib) } /* }}} */ +/* {{{ ZEND_MODULE_GLOBALS_CTOR */ +static ZEND_MODULE_GLOBALS_CTOR_D(zlib) +{ + zlib_globals->ob_gzhandler = NULL; +} +/* }}} */ + /* {{{ php_zlib_module_entry */ zend_module_entry php_zlib_module_entry = { STANDARD_MODULE_HEADER, @@ -1001,7 +1007,7 @@ zend_module_entry php_zlib_module_entry = { PHP_MINFO(zlib), "2.0", PHP_MODULE_GLOBALS(zlib), - NULL, + ZEND_MODULE_GLOBALS_CTOR_N(zlib), NULL, NULL, STANDARD_MODULE_PROPERTIES_EX -- 2.40.0