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

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 878e566a0048b8765aef0d367602228ebf9d4028..3db91c8814d3b21d3a03765e3bebdc620a2f3805 100644 (file)
--- 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;