From: Arnaud Le Blanc <lbarnaud@php.net>
Date: Thu, 28 May 2009 10:14:22 +0000 (+0000)
Subject: Fix "request_startup() for zlib module failed" when client does not
X-Git-Tag: php-5.2.10RC2~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=632c5a775f66fdea8acb84a9281d73e48eb44374;p=php

Fix "request_startup() for zlib module failed" when client does not
accepts compression and zlib.output_compression is On
---

diff --git a/ext/zlib/tests/008.phpt b/ext/zlib/tests/008.phpt
new file mode 100644
index 0000000000..4102e0c52d
--- /dev/null
+++ b/ext/zlib/tests/008.phpt
@@ -0,0 +1,11 @@
+--TEST--
+zlib.output_compression=1 with client not accepting compression
+--SKIPIF--
+<?php if (!extension_loaded('zlib')) die('skip'); ?>
+--INI--
+zlib.output_compression=1
+display_startup_errors=1
+--FILE--
+===DONE===
+--EXPECT--
+===DONE===
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 3c232d97ea..8110053a93 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -267,7 +267,9 @@ static PHP_RINIT_FUNCTION(zlib)
 	ZLIBG(ob_gzhandler_status) = 0;
 	ZLIBG(compression_coding) = 0;
 
-	return php_zlib_output_compression_start(TSRMLS_C);
+	php_zlib_output_compression_start(TSRMLS_C);
+
+	return SUCCESS;
 }
 /* }}} */