diff options
| author | Jani Taskinen <jani@php.net> | 2010-03-11 10:24:29 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2010-03-11 10:24:29 +0000 |
| commit | 06f072cb5e4e3582e20b8762141eccbc4dce85fa (patch) | |
| tree | 511382440db96edad3a2627ce361113e29d672ab /ext/standard/exec.c | |
| parent | f60946eb5430cd11daa9f88503dc9b1a9b7bd634 (diff) | |
| download | php-git-06f072cb5e4e3582e20b8762141eccbc4dce85fa.tar.gz | |
MFH: Improved / fixed output buffering (Michael Wallner)
Diffstat (limited to 'ext/standard/exec.c')
| -rw-r--r-- | ext/standard/exec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 5850026e17..7e770abd1d 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -139,8 +139,10 @@ 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) { |