mike Mon, 19 Sep 2011 14:37:00 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=316992
Log: Fixed bug #55544 ob_gzhandler always conflicts with zlib.output_compression Bug: https://bugs.php.net/55544 (Assigned) ob_gzhandler always conflicts with zlib.output_compression Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/ext/zlib/zlib.c U php/php-src/trunk/ext/zlib/zlib.c Modified: php/php-src/branches/PHP_5_4/NEWS =================================================================== --- php/php-src/branches/PHP_5_4/NEWS 2011-09-19 14:12:51 UTC (rev 316991) +++ php/php-src/branches/PHP_5_4/NEWS 2011-09-19 14:37:00 UTC (rev 316992) @@ -7,6 +7,10 @@ . 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) Modified: php/php-src/branches/PHP_5_4/ext/zlib/zlib.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/zlib/zlib.c 2011-09-19 14:12:51 UTC (rev 316991) +++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c 2011-09-19 14:37:00 UTC (rev 316992) @@ -847,6 +847,7 @@ /* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(zlib) { + ZLIBG(output_compression) = 0; ZLIBG(compression_coding) = 0; php_zlib_output_compression_start(TSRMLS_C); Modified: php/php-src/trunk/ext/zlib/zlib.c =================================================================== --- php/php-src/trunk/ext/zlib/zlib.c 2011-09-19 14:12:51 UTC (rev 316991) +++ php/php-src/trunk/ext/zlib/zlib.c 2011-09-19 14:37:00 UTC (rev 316992) @@ -847,6 +847,7 @@ /* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(zlib) { + ZLIBG(output_compression) = 0; ZLIBG(compression_coding) = 0; php_zlib_output_compression_start(TSRMLS_C);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
