Fix behavior on platforms which already measure wall-clock time

Author: kocsismate

main/main.c

@@ -385,32 +385,41 @@ static void php_binary_init(void)
 }
 /* }}} */
 
-/* {{{ PHP_INI_MH */
-static PHP_INI_MH(OnUpdateTimeout)
+static void updateTimeout(zend_string * new_value, int stage)
 {
-	if (stage==PHP_INI_STAGE_STARTUP) {
+	if (stage == PHP_INI_STAGE_STARTUP) {
 		/* Don't set a timeout on startup, only per-request */
 		ZEND_ATOL(EG(timeout_seconds), ZSTR_VAL(new_value));
-		return SUCCESS;
+		return;
 	}
 	zend_unset_timeout();
 	ZEND_ATOL(EG(timeout_seconds), ZSTR_VAL(new_value));
 	zend_set_timeout(EG(timeout_seconds), 0);
+}
+
+/* {{{ PHP_INI_MH */
+static PHP_INI_MH(OnUpdateTimeout)
+{
+	updateTimeout(new_value, stage);
 	return SUCCESS;
 }
 /* }}} */
 
 /* {{{ PHP_INI_MH */
 static PHP_INI_MH(OnUpdateWallTimeout)
 {
-	if (stage==PHP_INI_STAGE_STARTUP) {
+#if defined(WIN32) || defined(__CYGWIN__) || defined(__PASE__)
+	updateTimeout(new_value, stage);
+#else
+	if (stage == PHP_INI_STAGE_STARTUP) {
 		/* Don't set a timeout on startup, only per-request */
 		ZEND_ATOL(EG(wall_timeout_seconds), ZSTR_VAL(new_value));
 		return SUCCESS;
 	}
 	zend_unset_wall_timeout();
 	ZEND_ATOL(EG(wall_timeout_seconds), ZSTR_VAL(new_value));
 	zend_set_wall_timeout(EG(wall_timeout_seconds), 0);
+#endif
 	return SUCCESS;
 }
 /* }}} */
@@ -1702,7 +1711,9 @@ int php_request_startup(void)
 		} else {
 			zend_set_timeout(PG(max_input_time), 1);
 		}
+#if !defined(WIN32) && !defined(__CYGWIN__) && !defined(__PASE__)
 		zend_set_wall_timeout(EG(wall_timeout_seconds), 1);
+#endif
 
 		/* Disable realpath cache if an open_basedir is set */
 		if (PG(open_basedir) && *PG(open_basedir)) {
@@ -1792,7 +1803,9 @@ void php_request_shutdown(void *dummy)
 	/* 4. Reset max_execution_time and max_execution_wall_time (no longer executing php code after response sent) */
 	zend_try {
 		zend_unset_timeout();
+#if !defined(WIN32) && !defined(__CYGWIN__) && !defined(__PASE__)
 		zend_unset_wall_timeout();
+#endif
 	} zend_end_try();
 
 	/* 5. Call all extensions RSHUTDOWN functions */