From: Pierre Joye <pajoye@php.net>
Date: Mon, 26 Dec 2011 22:53:12 +0000 (+0000)
Subject: - Fix bug #60326, fix crash introduced by initial fix
X-Git-Tag: php-5.4.0RC5~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=850168ba62e8396246ab508e06afd5c9f3093680;p=php

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

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;