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

[Ilia Alshanetsky]

iliaa           Sun Apr 19 14:59:52 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard       exec.c 
  Log:
  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.1.2.15&r2=1.113.2.3.2.1.2.16&diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.113.2.3.2.1.2.15 
php-src/ext/standard/exec.c:1.113.2.3.2.1.2.16
--- php-src/ext/standard/exec.c:1.113.2.3.2.1.2.15      Wed Dec 31 11:15:45 2008
+++ php-src/ext/standard/exec.c Sun Apr 19 14:59:52 2009
@@ -16,7 +16,7 @@
    |         Ilia Alshanetsky <il...@php.net>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: exec.c,v 1.113.2.3.2.1.2.15 2008/12/31 11:15:45 sebastian Exp $ */
+/* $Id: exec.c,v 1.113.2.3.2.1.2.16 2009/04/19 14:59:52 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;



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