From: Antony Dovgal Date: Mon, 18 Aug 2008 07:47:04 +0000 (+0000) Subject: reverted because of test failures X-Git-Tag: php-5.2.7RC1~99 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2781ddf65e0fa26f29dbf2b0de3fc3713cf3fed9;p=php reverted because of test failures --- diff --git a/main/output.c b/main/output.c index 4b1aa37cb1..0b86131939 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); } } /* }}} */