tiny refacto

Author: dunglas

frankenphp.c

@@ -893,13 +893,13 @@ static void *php_main(void *arg) {
 
   sapi_startup(&frankenphp_sapi_module);
 
-#ifndef ZEND_MAX_EXECUTION_TIMERS
+#ifdef ZEND_MAX_EXECUTION_TIMERS
+  /* overwrite php.ini with custom user settings */
+  char *php_ini_overrides = go_get_custom_php_ini(false);
+#else
   /* overwrite php.ini with custom user settings and disable
    * max_execution_timers */
   char *php_ini_overrides = go_get_custom_php_ini(true);
-#else
-  /* overwrite php.ini with custom user settings */
-  char *php_ini_overrides = go_get_custom_php_ini(false);
 #endif
 
   if (php_ini_overrides != NULL) {

phpmainthread.go

@@ -196,13 +196,15 @@ func go_get_custom_php_ini(disableExecutionTimers C.bool) *C.char {
 		mainThread.phpIni = make(map[string]string)
 	}
 
-	// hardcoded ini settings if ZEND_MAX_EXECUTION_TIMERS is disabled
+	// Timeouts are currently fundamentally broken
+	// with ZTS except on Linux and FreeBSD: https://bugs.php.net/bug.php?id=79464
+	// Disable timeouts if ZEND_MAX_EXECUTION_TIMERS is not supported
 	if disableExecutionTimers {
 		mainThread.phpIni["max_execution_time"] = "0"
 		mainThread.phpIni["max_input_time"] = "-1"
 	}
 
-	// pass the php.ini overrides to PHP before startup
+	// Pass the php.ini overrides to PHP before startup
 	// TODO: if needed this would also be possible on a per-thread basis
 	overrides := ""
 	for k, v := range mainThread.phpIni {