Merge branch 'PHP-8.4'

cmb69 · cmb69 · commit ba6c00505d42 · 2024-11-25T23:09:36.000+01:00
* PHP-8.4: Fix GH-16849: Error dialog causes process to hang
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

Original file line number	Diff line number	Diff line change
`@@ -2120,8 +2120,9 @@ zend_result php_module_startup(sapi_module_struct sf, zend_module_entry additi`
`2120`	`2120`	`_set_invalid_parameter_handler(old_invalid_parameter_handler);`
`2121`	`2121`	`}`
`2122`	`2122`
`2123`		`- /* Disable the message box for assertions.*/`
	`2123`	`+ /* Disable the message box for assertions and errors.*/`
`2124`	`2124`	`_CrtSetReportMode(_CRT_ASSERT, 0);`
	`2125`	`+ _CrtSetReportMode(_CRT_ERROR, 0);`
`2125`	`2126`	`#endif`
`2126`	`2127`
`2127`	`2128`	`#ifdef ZTS`