Merge branch 'PHP-5.4'

* PHP-5.4: Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
13 years ago · 04789300a4
1 changed files with 1 additions and 1 deletions
--- 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);
 }
 /* }}} */