diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2012-09-10 14:57:45 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2012-09-10 14:57:45 +0400 |
| commit | 04789300a4c87e2f0b141bb69cd35cedf199495c (patch) | |
| tree | c3d0e75b12e5644d57d41e7790c891bd1ed6c41b | |
| parent | 6dca491a742f34a74ada651181534221c01eef13 (diff) | |
| parent | 62d86209cf83b6b1288b0c7567ace45b5be6025b (diff) | |
| download | php-git-04789300a4c87e2f0b141bb69cd35cedf199495c.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
| -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 1c39b3fd21..534e0b6278 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); } /* }}} */ |