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

[Pierre-Alain Joye]

pajoye          Mon Apr 20 06:36:05 2009 UTC

  Modified files:              
    /php-src/ext/standard       exec.c 
  Log:
  - use the new OB API (and fix build)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.141&r2=1.142&diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.141 php-src/ext/standard/exec.c:1.142
--- php-src/ext/standard/exec.c:1.141   Sun Apr 19 15:00:11 2009
+++ php-src/ext/standard/exec.c Mon Apr 20 06:36:05 2009
@@ -16,7 +16,7 @@
    |         Ilia Alshanetsky <il...@php.net>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: exec.c,v 1.141 2009/04/19 15:00:11 iliaa Exp $ */
+/* $Id: exec.c,v 1.142 2009/04/20 06:36:05 pajoye Exp $ */
 
 #include <stdio.h>
 #include "php.h"
@@ -111,8 +111,9 @@
                        }
 
                        if (type == 1) {
+                               int ob_level;
                                PHPWRITE(buf, bufl);
-                               if (OG(ob_nesting_level) < 1) {
+                               if 
((php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL, &ob_level 
TSRMLS_CC) == SUCCESS) && ob_level < 1) {
                                        sapi_flush(TSRMLS_C);
                                }
                        } else if (type == 2) {



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