- Fix bug #60326, fix crash introduced by initial fix

This commit is contained in:
Pierre Joye 2011-12-26 22:53:12 +00:00
parent 7dcc4c0d0e
commit 850168ba62

View File

@ -938,7 +938,7 @@ 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;
}
/* }}} */
@ -969,7 +969,6 @@ static PHP_RINIT_FUNCTION(zlib)
static PHP_RSHUTDOWN_FUNCTION(zlib)
{
ZLIBG(output_compression) = 0;
php_zlib_cleanup_ob_gzhandler_mess(TSRMLS_C);
return SUCCESS;