Commit: 62d86209cf83b6b1288b0c7567ace45b5be6025b Author: Dmitry Stogov <dmi...@zend.com> Mon, 10 Sep 2012 14:54:18 +0400 Parents: 58d6a425287dbc2c5ebad3eafeba828abbdf1d0d Branches: PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=62d86209cf83b6b1288b0c7567ace45b5be6025b Log: Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag Changed paths: M main/output.c Diff: diff --git a/main/output.c b/main/output.c index d4eaa67..e100057 100644 --- a/main/output.c +++ b/main/output.c @@ -214,7 +214,7 @@ PHPAPI void php_output_register_constants(TSRMLS_D) * Used by SAPIs to disable output */ PHPAPI void php_output_set_status(int status TSRMLS_DC) { - OG(flags) = status & 0xf; + OG(flags) = (OG(flags) & ~0xf) | (status & 0xf); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
