From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 15 Feb 2017 04:27:56 +0000 (+0800)
Subject: Workaround to fix bug #74093 (Maximum execution time of n+2 seconds exceed not writte... 
X-Git-Tag: php-7.1.3RC1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1242f53ddb018cdba93a9ffe4f56554a6471901f;p=php

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

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"
---

diff --git a/NEWS b/NEWS
index 4dfcf14343..a5c22b1f72 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 8f79881c0e..e02198526f 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -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