Merge branch 'PHP-8.2' into PHP-8.3

cmb69 · cmb69 · commit 929d42de50b6 · 2024-11-25T23:08:11.000+01:00
* PHP-8.2: Fix phpGH-16849: Error dialog causes process to hang
diff --git a/NEWS b/NEWS
@@ -63,6 +63,9 @@ PHP                                                                        NEWS
 - SOAP:
   . Fix make check being invoked in ext/soap. (Ma27)
 
+- Windows:
+  . Fixed bug GH-16849 (Error dialog causes process to hang). (cmb)
+
 07 Nov 2024, PHP 8.3.14RC1
 
 - CLI:
diff --git a/main/main.c b/main/main.c
@@ -2078,8 +2078,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
`@@ -2078,8 +2078,9 @@ zend_result php_module_startup(sapi_module_struct sf, zend_module_entry additi`
`2078`	`2078`	`_set_invalid_parameter_handler(old_invalid_parameter_handler);`
`2079`	`2079`	`}`
`2080`	`2080`
`2081`		`- /* Disable the message box for assertions.*/`
	`2081`	`+ /* Disable the message box for assertions and errors.*/`
`2082`	`2082`	`_CrtSetReportMode(_CRT_ASSERT, 0);`
	`2083`	`+ _CrtSetReportMode(_CRT_ERROR, 0);`
`2083`	`2084`	`#endif`
`2084`	`2085`
`2085`	`2086`	`#ifdef ZTS`