diff options
author | Dmitry Stogov <dmitry@zend.com> | 2012-09-10 14:54:18 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2012-09-10 14:54:18 +0400 |
commit | 62d86209cf83b6b1288b0c7567ace45b5be6025b (patch) | |
tree | e9f1b393c64bf69567ed0fb5b42b655568b50a7f /main | |
parent | 58d6a425287dbc2c5ebad3eafeba828abbdf1d0d (diff) | |
download | php-git-62d86209cf83b6b1288b0c7567ace45b5be6025b.tar.gz |
Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
Diffstat (limited to 'main')
-rw-r--r-- | main/output.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } /* }}} */ |