php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-28 02:02:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Workaround to fix bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log)

Browse Source 
Use a different exit code for hard_timeout, 124 is used by linux
timeout:http://man7.org/linux/man-pages/man1/timeout.1.html
"If the command times out, and --preserve-status is not set, then exit with status 124"
This commit is contained in:
Xinchen Hui
2017-02-15 12:27:56 +08:00
parent 930ce02048
commit 1242f53ddb
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -3,6 +3,8 @@ PHP NEWS
?? ??? 2017, PHP 7.1.3
- Core:
. Fixed bug #74093 (Maximum execution time of n+2 seconds exceed not written
in error_log). (Laruence)
. Fixed bug #73989 (PHP 7.1 Segfaults within Symfony test suite).
(Dmitry, Laruence)
. Fixed bug #74084 (Out of bound read - zend_mm_alloc_small). (Laruence)

2
Zend/zend_execute_API.c
View File

@@ -1203,7 +1203,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