From c1e0866da3477ff08e9791ec159079fff18b2349 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Mon, 18 Aug 2008 07:46:31 +0000 Subject: [PATCH] reverted because of test failures --- main/output.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/main/output.c b/main/output.c index 59c6c8bdaf8..6f3b4e3c5ac 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); } } /* }}} */