Fixed bug #55544 ob_gzhandler always conflicts with zlib.output_compression

diff --git a/NEWS b/NEWS
index b3a2689c0291605709902dadb2e8f8cf08582fc1..8d6452640647964c74a30c80459592feae4f4189 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,10 @@ PHP                                                                        NEWS
   . Fixed bug #55705 (Omitting a callable typehinted argument causes a segfault).
     (Felipe, Laruence)
 
+- Zlib:
+  . Fixed bug #55544 (ob_gzhandler always conflicts with 
+    zlib.output_compression). (Mike)
+
 15 Sep 2011, PHP 5.4.0 Beta
 - General improvements:
   . Added callable typehint. (Hannes)

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index b5300fc334c9f25615a35a8f1ce31532e3ff93dc..d5851ecb293db50515b7a22a5d03e78d80aa7cfb 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -847,6 +847,7 @@ 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);