felipe Wed Nov 12 16:40:40 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main main.c Log: - Silent valgrind http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.35&r2=1.640.2.23.2.57.2.36&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.57.2.35 php-src/main/main.c:1.640.2.23.2.57.2.36 --- php-src/main/main.c:1.640.2.23.2.57.2.35 Fri Nov 7 09:12:39 2008 +++ php-src/main/main.c Wed Nov 12 16:40:40 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.640.2.23.2.57.2.35 2008/11/07 09:12:39 indeyets Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.57.2.36 2008/11/12 16:40:40 felipe Exp $ */ /* {{{ includes */ @@ -1480,7 +1480,7 @@ zend_try { zend_bool send_buffer = SG(request_info).headers_only ? 0 : 1; if (CG(unclean_shutdown) && PG(last_error_type) == E_ERROR && - !OG(active_ob_buffer).chunk_size && PG(memory_limit) < zend_memory_usage(1 TSRMLS_CC)) { + OG(ob_nesting_level) && !OG(active_ob_buffer).chunk_size && PG(memory_limit) < zend_memory_usage(1 TSRMLS_CC)) { send_buffer = 0; } php_end_ob_buffers(send_buffer TSRMLS_CC);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php