tony2001 Mon Aug 18 07:46:31 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main output.c
Log:
reverted because of test failures
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.4.2.8&r2=1.167.2.3.2.4.2.9&diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.167.2.3.2.4.2.8
php-src/main/output.c:1.167.2.3.2.4.2.9
--- php-src/main/output.c:1.167.2.3.2.4.2.8 Mon Aug 18 04:08:17 2008
+++ php-src/main/output.c Mon Aug 18 07:46:31 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.167.2.3.2.4.2.8 2008/08/18 04:08:17 lbarnaud Exp $ */
+/* $Id: output.c,v 1.167.2.3.2.4.2.9 2008/08/18 07:46:31 tony2001 Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -336,13 +336,7 @@
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);
}
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
