Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag

dstogov · dstogov · commit 62d86209cf83 · 2012-09-10T14:54:18.000+04:00
diff --git 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);
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ PHPAPI void php_output_register_constants(TSRMLS_D)`
`214`	`214`	`* Used by SAPIs to disable output */`
`215`	`215`	`PHPAPI void php_output_set_status(int status TSRMLS_DC)`
`216`	`216`	`{`
`217`		`- OG(flags) = status & 0xf;`
	`217`	`+ OG(flags) = (OG(flags) & ~0xf) \| (status & 0xf);`
`218`	`218`	`}`
`219`	`219`	`/* }}} */`
`220`	`220`