[PHP-CVS] cvs: php-src /ext/standard exec.c

[Ilia Alshanetsky]

iliaa           Sun Apr 19 15:00:11 2009 UTC

  Modified files:              
    /php-src/ext/standard       exec.c 
  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.140&r2=1.141&diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.140 php-src/ext/standard/exec.c:1.141
--- php-src/ext/standard/exec.c:1.140   Tue Mar 10 23:39:39 2009
+++ php-src/ext/standard/exec.c Sun Apr 19 15:00:11 2009
@@ -16,7 +16,7 @@
    |         Ilia Alshanetsky <il...@php.net>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: exec.c,v 1.140 2009/03/10 23:39:39 helly Exp $ */
+/* $Id: exec.c,v 1.141 2009/04/19 15:00:11 iliaa Exp $ */
 
 #include <stdio.h>
 #include "php.h"
@@ -112,7 +112,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;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php