From 85a62e9086db7a8ddfcda4ab1279a2439935f8d5 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 19 Sep 2011 14:37:00 +0000
Subject: [PATCH] Fixed bug #55544 ob_gzhandler always conflicts with
 zlib.output_compression

---
 NEWS            | 4 ++++
 ext/zlib/zlib.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index b3a2689c02..8d64526406 100644
--- 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 b5300fc334..d5851ecb29 100644
--- 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);
-- 
2.50.1