From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 10 Sep 2012 10:54:18 +0000 (+0400)
Subject: Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
X-Git-Tag: php-5.4.9RC1~35^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62d86209cf83b6b1288b0c7567ace45b5be6025b;p=php

Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
---

diff --git a/main/output.c b/main/output.c
index d4eaa6701d..e100057ca9 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);
 }
 /* }}} */