]> granicus.if.org Git - php/commitdiff
- use the new OB API (and fix build)
authorPierre Joye <pajoye@php.net>
Mon, 20 Apr 2009 06:36:05 +0000 (06:36 +0000)
committerPierre Joye <pajoye@php.net>
Mon, 20 Apr 2009 06:36:05 +0000 (06:36 +0000)
ext/standard/exec.c

index 352d349f573c9125217c7221347029cd125a70ce..1fd528f4b26cbfe126ad44223d3a20bb96b2d2a5 100644 (file)
@@ -111,8 +111,9 @@ PHPAPI int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_
                        }
 
                        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) {