Commit 1e89e47376d for php.net
commit 1e89e47376d7465039448fa67c75db17c92fb5fb
Merge: f6d8d04f13e d27da095b1c
Author: Ilia Alshanetsky <ilia@ilia.ws>
Date: Wed Jul 1 07:55:11 2026 -0400
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix infinite recursion in property hook getter in opcache preloaded trait
diff --cc NEWS
index a08132d60b5,012a28ffe6c..7cabb876d20
--- a/NEWS
+++ b/NEWS
@@@ -12,17 -6,6 +12,19 @@@ PH
. Fixed bug GH-18173 (ext/hash relies on implementation-defined malloc
alignment). (iliaal)
+- Opcache:
+ . Fixed bug GH-22158 (Tracing JIT dispatches the observer begin handler
+ through the wrong run_time_cache slot on megamorphic calls). (ptondereau,
+ iliaal)
+ . Fixed bug GH-22443 (Tracing JIT SIGSEGV on megamorphic dynamic calls from
+ an undereferenced run_time_cache map_ptr offset). (iliaal)
++ . Fixed bug GH-21770 (Infinite recursion in property hook getter in opcache
++ preloaded trait). (iliaal)
+
+- OpenSSL:
+ . Fixed timeout for supplemental read at end of a blocking stream in SSL
+ stream wrapper. (ilutov)
+
- Intl:
. Fixed Locale::lookup() and locale_lookup() to return NULL instead of the
fallback locale when a language tag cannot be canonicalized. (Weilin Du)