]> granicus.if.org Git - php/commitdiff
reverted because it causes lots of test failures in ext/soap
authorAntony Dovgal <tony2001@php.net>
Mon, 18 Aug 2008 07:45:59 +0000 (07:45 +0000)
committerAntony Dovgal <tony2001@php.net>
Mon, 18 Aug 2008 07:45:59 +0000 (07:45 +0000)
main/output.c

index 97a997a303451edb9c8c65096fa46a9ee3532f94..5a2b8641d39a2e440a4f0645f5b3c0cf8c1d2aee 100644 (file)
@@ -1275,11 +1275,7 @@ static inline int php_output_stack_pop(int flags TSRMLS_DC)
                
                /* 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!) */