tony2001 Mon Aug 18 07:45:59 2008 UTC
Modified files:
/php-src/main output.c
Log:
reverted because it causes lots of test failures in ext/soap
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.213&r2=1.214&diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.213 php-src/main/output.c:1.214
--- php-src/main/output.c:1.213 Mon Aug 18 04:11:51 2008
+++ php-src/main/output.c Mon Aug 18 07:45:59 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.213 2008/08/18 04:11:51 lbarnaud Exp $ */
+/* $Id: output.c,v 1.214 2008/08/18 07:45:59 tony2001 Exp $ */
#ifndef PHP_OUTPUT_DEBUG
# define PHP_OUTPUT_DEBUG 0
@@ -1275,11 +1275,7 @@
/* pass output along */
if (context.out.data && context.out.used && !(flags &
PHP_OUTPUT_POP_DISCARD)) {
- /* 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) || orphan->size) {
- php_output_write(context.out.data,
context.out.used TSRMLS_CC);
- }
+ php_output_write(context.out.data, context.out.used
TSRMLS_CC);
}
/* destroy the handler (after write!) */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php