Merge branch 'PHP-8.4'

* PHP-8.4: Fix GH-16849: Error dialog causes process to hang
php · Nov 25, 2024 · ba6c005 · ba6c005
2 parents 3e1138e + 4c57105
commit ba6c005
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/main/main.c b/main/main.c
@@ -2120,8 +2120,9 @@ zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additi
 		_set_invalid_parameter_handler(old_invalid_parameter_handler);
 	}
 
-	/* Disable the message box for assertions.*/
+	/* Disable the message box for assertions and errors.*/
 	_CrtSetReportMode(_CRT_ASSERT, 0);
+	_CrtSetReportMode(_CRT_ERROR, 0);
 #endif
 
 #ifdef ZTS