Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Fix GH-16849: Error dialog causes process to hang
php · Nov 25, 2024 · 4c57105 · 4c57105
2 parents 7417c63 + 929d42d
commit 4c57105
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
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