svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c

cataphract Wed, 07 Mar 2012 08:51:30 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323988 Log: - Tentative fix for bug #61306. #cjones: Will update NEWS when confirmed it fixes the problem. Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request Changed paths: U php/php-src/branches/PHP_5_4/ext/zlib/zlib.c U php/php-src/trunk/ext/zlib/zlib.c Modified: php/php-src/branches/PHP_5_4/ext/zlib/zlib.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/zlib/zlib.c 2012-03-07 07:55:26 UTC (rev 323987) +++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c 2012-03-07 08:51:30 UTC (rev 323988) @@ -938,7 +938,6 @@ 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 @@ } /* }}} */ +/* {{{ 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,9 +1007,9 @@ PHP_MINFO(zlib), "2.0", PHP_MODULE_GLOBALS(zlib), + ZEND_MODULE_GLOBALS_CTOR_N(zlib), NULL, NULL, - NULL, STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ Modified: php/php-src/trunk/ext/zlib/zlib.c =================================================================== --- php/php-src/trunk/ext/zlib/zlib.c 2012-03-07 07:55:26 UTC (rev 323987) +++ php/php-src/trunk/ext/zlib/zlib.c 2012-03-07 08:51:30 UTC (rev 323988) @@ -938,7 +938,6 @@ 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; } /* }}} */ @@ -990,6 +989,13 @@ } /* }}} */ +/* {{{ 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, @@ -1002,9 +1008,9 @@ PHP_MINFO(zlib), "2.0", PHP_MODULE_GLOBALS(zlib), + ZEND_MODULE_GLOBALS_CTOR_N(zlib), NULL, NULL, - NULL, STANDARD_MODULE_PROPERTIES_EX }; /* }}} */