diff options
| author | Nikita Popov <nikic@php.net> | 2016-11-20 19:10:03 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-11-20 19:10:03 +0100 |
| commit | c58378619b34b1a15fbbf5500095d9ca99e59e90 (patch) | |
| tree | f10562fcb906b3994b8fded8216abb60821f2cce /Zend/zend_execute_API.c | |
| parent | b7fee22e73f403acba9e7c1fff12c23f51139a75 (diff) | |
| parent | ff5a65d26b139142c5e967582c369ef65b79adf8 (diff) | |
| download | php-git-c58378619b34b1a15fbbf5500095d9ca99e59e90.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 95b7af0857..cba929a7fd 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1201,7 +1201,7 @@ static void zend_timeout_handler(int dummy) /* {{{ */ output_len = snprintf(log_buffer, sizeof(log_buffer), "\nFatal error: Maximum execution time of " ZEND_LONG_FMT "+" ZEND_LONG_FMT " seconds exceeded (terminated) in %s on line %d\n", EG(timeout_seconds), EG(hard_timeout), error_filename, error_lineno); if (output_len > 0) { - quiet_write(2, log_buffer, MIN(output_len, sizeof(log_buffer))); + write(2, log_buffer, MIN(output_len, sizeof(log_buffer))); } _exit(1); } |