1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 16:22:37 +01:00

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
This commit is contained in:
Dmitry Stogov
2012-09-10 14:57:45 +04:00

View File

@@ -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);
}
/* }}} */