From: Michael Wallner <mike@php.net>
Date: Mon, 19 Sep 2011 15:20:38 +0000 (+0000)
Subject: fix r316992
X-Git-Tag: php-5.5.0alpha1~1106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f989a865007bf6eb02e763f16c3a218b6232e40c;p=php

fix r316992
---

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index d5851ecb29..999206fa05 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -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),