diff options
| author | Pierre Joye <pajoye@php.net> | 2011-12-26 22:53:12 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2011-12-26 22:53:12 +0000 |
| commit | 850168ba62e8396246ab508e06afd5c9f3093680 (patch) | |
| tree | dda198a8faaecae4ebfe33dfed78c8ac2598a76d /ext/zlib/zlib.c | |
| parent | 7dcc4c0d0e44ccfe6018b2630e5721772d19b2e4 (diff) | |
| download | php-git-850168ba62e8396246ab508e06afd5c9f3093680.tar.gz | |
- Fix bug #60326, fix crash introduced by initial fix
Diffstat (limited to 'ext/zlib/zlib.c')
| -rw-r--r-- | ext/zlib/zlib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 878e566a00..3db91c8814 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -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; |