Commit 4f40c20ec9c for php.net
commit 4f40c20ec9cfdb49d6e65bc912868325b67e7e5c
Merge: b09ac895398 e50cd125c9f
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date: Wed Apr 8 13:36:04 2026 +0200
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Add EG(bailout) consistency assertion
Fix faulty zend_try handling in zend_jit_trace()
diff --cc NEWS
index 357bf8bd3de,84ef07ea11e..52119c3579c
--- a/NEWS
+++ b/NEWS
@@@ -22,15 -23,11 +22,16 @@@ PH
zend_jit_use_reg). (Arnaud)
. Fixed bug GH-21593 (Borked function JIT JMPNZ smart branch). (ilutov)
. Fixed bug GH-21460 (COND optimization regression). (Dmitry, Arnaud)
+ . Fixed faulty returns out of zend_try block in zend_jit_trace(). (ilutov)
- OpenSSL:
+ . Fix memory leak regression in openssl_pbkdf2(). (ndossche)
. Fix a bunch of memory leaks and crashes on edge cases. (ndossche)
+- DOM:
+ . Fixed bug GH-21566 (Dom\XMLDocument::C14N() emits duplicate xmlns
+ declarations after setAttributeNS()). (David Carlier)
+
- SPL:
. Fixed bug GH-21499 (RecursiveArrayIterator getChildren UAF after parent
free). (Girgias)