Commit 0826ebea2be for php
commit 0826ebea2befc159daf37de8a154233e6b954126
Merge: c72a5cad08b e7b225697ef
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date: Tue Sep 29 21:44:05 2026 +0200
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix GH-23980: ZEND_ASSERT violation @ ZEND_INCLUDE_OR_EVAL (include/eval run with a pending exception)
diff --cc NEWS
index 1f0cfb46efe,dbb54c4cbaa..1320a09aa7e
--- a/NEWS
+++ b/NEWS
@@@ -13,13 -17,8 +13,14 @@@ PH
(ndossche)
. Fixed AVX being reported as supported when the OS has not enabled AVX
state. (Ilia Alshanetsky)
+ . Fixed GH-23980 (ZEND_ASSERT violation @ ZEND_INCLUDE_OR_EVAL). (ndossche)
+- CLI
+ . Fix GH-22567 (Windows ZTS CLI SAPI should refresh its TSRMLS cache during
+ request activation). (matyhtf)
+ . Fixed bug GH-23764 (Built-in server leaks a file descriptor on every HEAD
+ request for a static file). (jakubskopal)
+
- DOM:
. Fixed use-after-free when re-constructing a DOMXPath whose php:function
registrations are freed while still reachable from the cycle collector.
diff --cc Zend/zend_vm_execute.h
index 2ba4011cf2b,2ebbfaa9c05..de1a7159338
Binary files differ