]> granicus.if.org Git - php/commitdiff
Fix "request_startup() for zlib module failed" when client does not
authorArnaud Le Blanc <lbarnaud@php.net>
Thu, 28 May 2009 10:14:22 +0000 (10:14 +0000)
committerArnaud Le Blanc <lbarnaud@php.net>
Thu, 28 May 2009 10:14:22 +0000 (10:14 +0000)
accepts compression and zlib.output_compression is On

ext/zlib/tests/008.phpt [new file with mode: 0644]
ext/zlib/zlib.c

diff --git a/ext/zlib/tests/008.phpt b/ext/zlib/tests/008.phpt
new file mode 100644 (file)
index 0000000..4102e0c
--- /dev/null
@@ -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===
index 3c232d97eabffe0445a518419eed63d8c5b66d19..8110053a9377469070b012716a6a73140765b7e3 100644 (file)
@@ -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;
 }
 /* }}} */