- Tentative fix for bug #61306.

#cjones: Will update NEWS when confirmed it fixes the problem.
This commit is contained in:
Gustavo André dos Santos Lopes 2012-03-07 08:51:30 +00:00
parent 4cc747677c
commit d13f833875

View File

@ -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