cvs: php-src(PHP_5_2) / NEWS /ext/standard exec.c

iliaa Sun Apr 19 15:01:12 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard exec.c /php-src NEWS Log: MFB: Fixed bug #47937 (system() calls sapi_flush() regardless of output buffering) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.113.2.3.2.11&r2=1.113.2.3.2.12&diff_format=u Index: php-src/ext/standard/exec.c diff -u php-src/ext/standard/exec.c:1.113.2.3.2.11 php-src/ext/standard/exec.c:1.113.2.3.2.12 --- php-src/ext/standard/exec.c:1.113.2.3.2.11 Wed Dec 31 11:17:44 2008 +++ php-src/ext/standard/exec.c Sun Apr 19 15:01:11 2009 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <iliaa@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.113.2.3.2.11 2008/12/31 11:17:44 sebastian Exp $ */ +/* $Id: exec.c,v 1.113.2.3.2.12 2009/04/19 15:01:11 iliaa Exp $ */ #include <stdio.h> #include "php.h" @@ -131,7 +131,9 @@ if (type == 1) { PHPWRITE(buf, bufl); - sapi_flush(TSRMLS_C); + if (OG(ob_nesting_level) < 1) { + sapi_flush(TSRMLS_C); + } } else if (type == 2) { /* strip trailing whitespaces */ l = bufl; http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1472&r2=1.2027.2.547.2.1473&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1472 php-src/NEWS:1.2027.2.547.2.1473 --- php-src/NEWS:1.2027.2.547.2.1472 Sun Apr 19 14:44:09 2009 +++ php-src/NEWS Sun Apr 19 15:01:11 2009 @@ -15,6 +15,8 @@ - Fixed bug #47969 (ezmlm_hash() returns different values depend on OS). (Ilia) - Fixed bug #47946 (ImageConvolution overwrites background). (Ilia) +- Fixed bug #47937 (system() calls sapi_flush() regardless of output + buffering). (Ilia) - Fixed bug #47903 ("@" operator does not work with string offsets). (Felipe) - Fixed bug #47893 (CLI aborts on non blocking stdout). (Arnaud) - Fixed bug #47849 (Non-deep import loses the namespace). (Rob)