Merge branch 'PHP-8.2' into PHP-8.3

# Conflicts:
#	NEWS

NEWS

@@ -9,6 +9,8 @@ PHP                                                                        NEWS
 15 Aug 2024, PHP 8.3.11
 
 - Core:
+  . Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer).
+    (zeriyoshi)
   . Fixed bug GH-15020 (Memory leak in Zend/Optimizer/escape_analysis.c).
     (nielsdos)
   . Fixed bug GH-15023 (Memory leak in Zend/zend_ini.c). (nielsdos)

Zend/zend_max_execution_timer.c

@@ -24,13 +24,14 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 
+#include "zend.h"
+#include "zend_globals.h"
+#include "zend_portability.h"
+
 #if __has_feature(memory_sanitizer)
 # include <sanitizer/msan_interface.h>
 #endif
 
-#include "zend.h"
-#include "zend_globals.h"
-
 // Musl Libc defines this macro, glibc does not
 // According to "man 2 timer_create" this field should always be available, but it's not: https://sourceware.org/bugzilla/show_bug.cgi?id=27417
 # ifndef sigev_notify_thread_id
@@ -53,8 +54,8 @@ ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
 
 #if __has_feature(memory_sanitizer)
 	/* MSan does not intercept timer_create() */
-		__msan_unpoison(&EG(max_execution_timer_timer),
-						sizeof(EG(max_execution_timer_timer)));
+	__msan_unpoison(&EG(max_execution_timer_timer),
+					sizeof(EG(max_execution_timer_timer)));
 #endif
 
 	// Measure wall time instead of CPU time as originally planned now that it is possible https://github.com/php/php-src/pull/6504#issuecomment-1370303727