diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-02-15 12:30:23 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-02-15 12:30:23 +0800 |
| commit | e33afaa2993f5f62dbb21eefabae4dd4ce62947e (patch) | |
| tree | 6fab6cd7148d55e66132f12848ed3016f5cef2b6 /Zend/zend_execute_API.c | |
| parent | 2ed4723aff52b01b57473e2ae5cc22649648954c (diff) | |
| parent | 1242f53ddb018cdba93a9ffe4f56554a6471901f (diff) | |
| download | php-git-e33afaa2993f5f62dbb21eefabae4dd4ce62947e.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Workaround to fix bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log)
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 c3c7920019..9190eda9f0 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1217,7 +1217,7 @@ static void zend_timeout_handler(int dummy) /* {{{ */ if (output_len > 0) { write(2, log_buffer, MIN(output_len, sizeof(log_buffer))); } - _exit(1); + _exit(124); } #endif |