]> granicus.if.org Git - php/commitdiff
fix r316992
authorMichael Wallner <mike@php.net>
Mon, 19 Sep 2011 15:20:38 +0000 (15:20 +0000)
committerMichael Wallner <mike@php.net>
Mon, 19 Sep 2011 15:20:38 +0000 (15:20 +0000)
ext/zlib/zlib.c

index d5851ecb293db50515b7a22a5d03e78d80aa7cfb..999206fa05bd121f0990e20eb4596922f4eb30ee 100644 (file)
@@ -847,7 +847,6 @@ static PHP_MSHUTDOWN_FUNCTION(zlib)
 /* {{{ PHP_RINIT_FUNCTION */
 static PHP_RINIT_FUNCTION(zlib)
 {
-       ZLIBG(output_compression) = 0;
        ZLIBG(compression_coding) = 0;
 
        php_zlib_output_compression_start(TSRMLS_C);
@@ -856,6 +855,13 @@ static PHP_RINIT_FUNCTION(zlib)
 }
 /* }}} */
 
+static PHP_RSHUTDOWN_FUNCTION(zlib)
+{
+       ZLIBG(output_compression) = 0;
+
+    return SUCCESS;
+}
+
 /* {{{ PHP_MINFO_FUNCTION */
 static PHP_MINFO_FUNCTION(zlib)
 {
@@ -879,7 +885,7 @@ zend_module_entry php_zlib_module_entry = {
        PHP_MINIT(zlib),
        PHP_MSHUTDOWN(zlib),
        PHP_RINIT(zlib),
-       NULL,
+       PHP_RSHUTDOWN(zlib),
        PHP_MINFO(zlib),
        "2.0",
        PHP_MODULE_GLOBALS(zlib),