diff options
| author | Antony Dovgal <tony2001@php.net> | 2008-08-18 07:46:31 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2008-08-18 07:46:31 +0000 |
| commit | c1e0866da3477ff08e9791ec159079fff18b2349 (patch) | |
| tree | 80a7bb47bda2541236ac2cb2a4a9b3a52da52242 /main/output.c | |
| parent | 7d1cd6a94ba92e34111030abb6f2b4d85882036b (diff) | |
| download | php-git-c1e0866da3477ff08e9791ec159079fff18b2349.tar.gz | |
reverted because of test failures
Diffstat (limited to 'main/output.c')
| -rw-r--r-- | main/output.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/main/output.c b/main/output.c index 59c6c8bdaf..6f3b4e3c5a 100644 --- a/main/output.c +++ b/main/output.c @@ -336,13 +336,7 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS PHPAPI void php_end_ob_buffers(zend_bool send_buffer TSRMLS_DC) { while (OG(ob_nesting_level)!=0) { - /* in case of unclean_shutdown, do not output the buffer if it is not - * meant to be until end of script or ob_end_*() call */ - if (CG(unclean_shutdown) && !OG(active_ob_buffer).chunk_size) { - php_end_ob_buffer(0, 0 TSRMLS_CC); - } else { - php_end_ob_buffer(send_buffer, 0 TSRMLS_CC); - } + php_end_ob_buffer(send_buffer, 0 TSRMLS_CC); } } /* }}} */ |