Commit c5fcb96dbc2 for php
commit c5fcb96dbc2047bf2315869819d3b2da6406d8a1
Merge: f9cf4fb51bf 0f0e66365f6
Author: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Mon Oct 12 16:46:30 2026 +0200
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Fix skipped catch block when switching fibers during exception unwinding (#24117)
diff --cc NEWS
index cbc53640df9,d893f2e33a4..334961f1b15
--- a/NEWS
+++ b/NEWS
@@@ -13,7 -13,13 +13,9 @@@ PH
. Fixed memory manager keeping a block reallocated to exactly the size of
the next smaller bin in its larger bin, which efree_size() then freed
into the wrong one. (Marc Bennewitz)
- . Fixed bug GH-24081 (User opcode handlers resume execution against a stale
- frame under ZEND_VM_KIND_TAILCALL). (devnexen)
- . Fixed bug GH-24218 (Invalid opcode for count() of a literal array
- without SCCP). (lazerg)
. Fix throwing behaviour with recursive arrays in VM. (ndossche)
+ . Fixed skipped catch block when switching fibers during exception unwinding
+ (Nicolas Grekas)
- FPM:
. Fixed bug GH-24229 (fcgi_close() passes shutdown() a literal 1, which is