Merge branch 'PHP-8.3' into PHP-8.4

cmb69 · cmb69 · commit 4c5710579a28 · 2024-11-25T23:09:13.000+01:00
* PHP-8.3: Fix phpGH-16849: Error dialog causes process to hang
diff --git a/NEWS b/NEWS
@@ -15,6 +15,9 @@ PHP                                                                        NEWS
     (dktapps)
   . Fixed bug GH-16902 (Set of opcache tests fail zts+aarch64). (nielsdos)
 
+- Windows:
+  . Fixed bug GH-16849 (Error dialog causes process to hang). (cmb)
+
 21 Nov 2024, PHP 8.4.1
 
 - BcMath:
diff --git a/main/main.c b/main/main.c
@@ -2118,8 +2118,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
`@@ -2118,8 +2118,9 @@ zend_result php_module_startup(sapi_module_struct sf, zend_module_entry additi`
`2118`	`2118`	`_set_invalid_parameter_handler(old_invalid_parameter_handler);`
`2119`	`2119`	`}`
`2120`	`2120`
`2121`		`- /* Disable the message box for assertions.*/`
	`2121`	`+ /* Disable the message box for assertions and errors.*/`
`2122`	`2122`	`_CrtSetReportMode(_CRT_ASSERT, 0);`
	`2123`	`+ _CrtSetReportMode(_CRT_ERROR, 0);`
`2123`	`2124`	`#endif`
`2124`	`2125`
`2125`	`2126`	`#ifdef ZTS`