mirror of
https://github.com/php/php-src.git
synced 2025-08-15 13:38:49 +02:00
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fixed bug GH-13193 again
This commit is contained in:
commit
e98e4e39a3
2 changed files with 3 additions and 1 deletions
2
NEWS
2
NEWS
|
@ -27,6 +27,8 @@ PHP NEWS
|
|||
. Fixed bug GH-15367 (dl() of module with aliased class crashes in shutdown).
|
||||
(Arnaud)
|
||||
. Fixed OSS-Fuzz #403308724. (nielsdos)
|
||||
. Fixed bug GH-13193 again (Significant performance degradation in 'foreach').
|
||||
(nielsdos)
|
||||
|
||||
- DBA:
|
||||
. Fixed assertion violation when opening the same file with dba_open
|
||||
|
|
|
@ -1917,7 +1917,7 @@ ZEND_API int zend_gc_collect_cycles(void)
|
|||
bool did_rerun_gc = 0;
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue