From: Anatol Belski <ab@php.net>
Date: Sun, 5 Jun 2016 09:38:12 +0000 (+0200)
Subject: fix hard_timeout support in shutdown functions
X-Git-Tag: php-7.1.0alpha1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52ebd5611f5c9ff233f9cce16ec17b4560832af7;p=php

fix hard_timeout support in shutdown functions
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index dba10e3564..05ee781bd6 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1157,8 +1157,22 @@ static void zend_set_timeout_ex(zend_long seconds, int reset_signals);
 
 ZEND_API ZEND_NORETURN void zend_timeout(int dummy) /* {{{ */
 {
+#if defined(PHP_WIN32)
+	/* No action is needed if we're timed out because zero seconds are
+	   just ignored. Also, the hard timeout needs to be respected. If the
+	   timer is not restarted properly, it could hang in the shutdown
+	   function. */
+	if (EG(hard_timeout) > 0) {
+		EG(timed_out) = 0;
+		zend_set_timeout_ex(EG(hard_timeout), 1);
+		/* XXX Abused, introduce an additional flag if the value needs to be kept. */
+		EG(hard_timeout) = 0;
+	}
+#else
 	EG(timed_out) = 0;
 	zend_set_timeout_ex(0, 1);
+#endif
+
 	zend_error_noreturn(E_ERROR, "Maximum execution time of %pd second%s exceeded", EG(timeout_seconds), EG(timeout_seconds) == 1 ? "" : "s");
 }
 /* }}} */