svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_2/ext/zlib/php_zlib.h PHP_5_2/main/SAPI.c PHP_5_3/NEWS PHP_5_3/ext/zlib/php_zlib.h PHP_5_3/main/SAPI.c

jani Mon, 03 Aug 2009 18:15:30 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286751 Log: - Fixed bug #48994 (zlib.output_compression does not ouput HTTP headers when set to a string value) # also fixes bug #35936 (ini.zlib.output-compression Documentation :) Bugs: http://bugs.php.net/48994 (Assigned) zlib.output_compression does not ouput HTTP headers when set to a string value http://bugs.php.net/35936 (Open) ini.zlib.output-compression Documentation Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/zlib/php_zlib.h U php/php-src/branches/PHP_5_2/main/SAPI.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/zlib/php_zlib.h U php/php-src/branches/PHP_5_3/main/SAPI.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2009-08-03 18:09:19 UTC (rev 286750) +++ php/php-src/branches/PHP_5_2/NEWS 2009-08-03 18:15:30 UTC (rev 286751) @@ -16,6 +16,8 @@ (Jani) - Fixed bug #49026 (proc_open() can bypass safe_mode_protected_env_vars restrictions). (Ilia) +- Fixed bug #48994 (zlib.output_compression does not ouput HTTP headers when + set to a string value). (Jani) - Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe) - Fixed bug #48962 (cURL does not upload files with specified filename). (Ilia) Modified: php/php-src/branches/PHP_5_2/ext/zlib/php_zlib.h =================================================================== --- php/php-src/branches/PHP_5_2/ext/zlib/php_zlib.h 2009-08-03 18:09:19 UTC (rev 286750) +++ php/php-src/branches/PHP_5_2/ext/zlib/php_zlib.h 2009-08-03 18:15:30 UTC (rev 286751) @@ -35,6 +35,8 @@ char *output_handler; ZEND_END_MODULE_GLOBALS(zlib) +PHPAPI ZEND_EXTERN_MODULE_GLOBALS(zlib) + extern php_stream_filter_factory php_zlib_filter_factory; extern zend_module_entry php_zlib_module_entry; #define zlib_module_ptr &php_zlib_module_entry Modified: php/php-src/branches/PHP_5_2/main/SAPI.c =================================================================== --- php/php-src/branches/PHP_5_2/main/SAPI.c 2009-08-03 18:09:19 UTC (rev 286750) +++ php/php-src/branches/PHP_5_2/main/SAPI.c 2009-08-03 18:15:30 UTC (rev 286751) @@ -768,7 +768,7 @@ /* Add output compression headers at this late stage in order to make it possible to switch it off inside the script. */ - if (zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0)) { + if (ZLIBG(output_compression)) { zval nm_zlib_get_coding_type; zval *uf_result = NULL; Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-08-03 18:09:19 UTC (rev 286750) +++ php/php-src/branches/PHP_5_3/NEWS 2009-08-03 18:15:30 UTC (rev 286751) @@ -38,6 +38,8 @@ a chunk). (andreas dot streichardt at globalpark dot com, Ilia) - Fixed bug #49000 (PHP CLI in Interactive mode (php -a) crashes when including files from function). (Stas) +- Fixed bug #48994 (zlib.output_compression does not ouput HTTP headers when + set to a string value). (Jani) - Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe) - Fixed bug #48962 (cURL does not upload files with specified filename). (Ilia) Modified: php/php-src/branches/PHP_5_3/ext/zlib/php_zlib.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/zlib/php_zlib.h 2009-08-03 18:09:19 UTC (rev 286750) +++ php/php-src/branches/PHP_5_3/ext/zlib/php_zlib.h 2009-08-03 18:15:30 UTC (rev 286751) @@ -35,6 +35,8 @@ char *output_handler; ZEND_END_MODULE_GLOBALS(zlib) +PHPAPI ZEND_EXTERN_MODULE_GLOBALS(zlib) + extern php_stream_filter_factory php_zlib_filter_factory; extern zend_module_entry php_zlib_module_entry; #define zlib_module_ptr &php_zlib_module_entry Modified: php/php-src/branches/PHP_5_3/main/SAPI.c =================================================================== --- php/php-src/branches/PHP_5_3/main/SAPI.c 2009-08-03 18:09:19 UTC (rev 286750) +++ php/php-src/branches/PHP_5_3/main/SAPI.c 2009-08-03 18:15:30 UTC (rev 286751) @@ -793,7 +793,7 @@ /* Add output compression headers at this late stage in order to make it possible to switch it off inside the script. */ - if (zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0)) { + if (ZLIBG(output_compression)) { zval nm_zlib_get_coding_type; zval *uf_result = NULL;