Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Fixed bug GH-13193 again
This commit is contained in:
Niels Dossche 2025-03-21 11:48:16 +01:00
commit e98e4e39a3
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 3 additions and 1 deletions

2
NEWS
View file

@ -27,6 +27,8 @@ PHP NEWS
. Fixed bug GH-15367 (dl() of module with aliased class crashes in shutdown). . Fixed bug GH-15367 (dl() of module with aliased class crashes in shutdown).
(Arnaud) (Arnaud)
. Fixed OSS-Fuzz #403308724. (nielsdos) . Fixed OSS-Fuzz #403308724. (nielsdos)
. Fixed bug GH-13193 again (Significant performance degradation in 'foreach').
(nielsdos)
- DBA: - DBA:
. Fixed assertion violation when opening the same file with dba_open . Fixed assertion violation when opening the same file with dba_open

View file

@ -1917,7 +1917,7 @@ ZEND_API int zend_gc_collect_cycles(void)
bool did_rerun_gc = 0; bool did_rerun_gc = 0;
zend_hrtime_t start_time = zend_hrtime(); zend_hrtime_t start_time = zend_hrtime();
if (GC_G(num_roots) && GC_G(gc_active)) { if (GC_G(num_roots) && !GC_G(gc_active)) {
zend_gc_remove_root_tmpvars(); zend_gc_remove_root_tmpvars();
} }