Merge branch 'PHP-8.4'

* PHP-8.4:
Fix DOM test on higher branches

Fix DOM test on higher branches

Merge branch 'PHP-8.4'

* PHP-8.4:
Fix GH-17225: NULL deref in spl_directory.c

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
Fix GH-17225: NULL deref in spl_directory.c

Fix GH-17225: NULL deref in spl_directory.c

NULL checks for the glob stream are inconsistently applied. To solve
this generally, factor it out to a helper function so it's less likely

Fix GH-17225: NULL deref in spl_directory.c

NULL checks for the glob stream are inconsistently applied. To solve
this generally, factor it out to a helper function so it's less likely
to be forgotten in the future.

Closes GH-17231.

show more ...

ext/pdo_firebird: Fix label follow by declaration (#17229)

A label should be followed by a statement and not a declaration, else old gcc gives the following error: a label can only be part o

ext/pdo_firebird: Fix label follow by declaration (#17229)

A label should be followed by a statement and not a declaration, else old gcc gives the following error: a label can only be part of a statement and a declaration is not a statement

To fix this we wrap the code in the switch case block in braces.

show more ...

Merge branch 'PHP-8.4'

* PHP-8.4:
Fix GH-17224: UAF in importNode

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
Fix GH-17224: UAF in importNode

Fix GH-17224: UAF in importNode

Wrong document pointer is used for the namespace copy.

Closes GH-17230.

Merge branch 'PHP-8.4'

* PHP-8.4:
Fix GH-17216: Trampoline crash on error

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
Fix GH-17216: Trampoline crash on error

Fix GH-17216: Trampoline crash on error

The error handling is incomplete on argument cleanup.
1. The fci is not cleared which means that zend_free_trampoline() is
never called.

Fix GH-17216: Trampoline crash on error

The error handling is incomplete on argument cleanup.
1. The fci is not cleared which means that zend_free_trampoline() is
never called.
2. The cleaning for extra named arguments was missing, resulting in
memory leak.

Closes GH-17219.

show more ...

ext/sockets: further timeout handling changes. (#17210)

close GH-17210

Merge branch 'PHP-8.4'

* PHP-8.4:
Add observer temporary to dl'ed functions

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
Add observer temporary to dl'ed functions

Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
Add observer temporary to dl'ed functions

Add observer temporary to dl'ed functions

When observer is enabled, we normally add an extra temporary to all
functions, to store the previously observed frame. However, this is done in

Add observer temporary to dl'ed functions

When observer is enabled, we normally add an extra temporary to all
functions, to store the previously observed frame. However, this is done in
zend_observer_post_startup() so it doesn't happen to dl'ed() functions.

One possible fix would be to move that from zend_observer_post_startup()
to zend_register_functions(), but this would be too early: Observer may
not be enabled when zend_register_functions() is called, and may still be
enabled later.

However, when zend_register_functions() is called at run-time (during dl()),
we know definitively whether observer is enabled.

Here I update zend_register_functions() to add a temporary to dl'ed()
functions when observer is enabled.

Fixes: GH-17211
Closes: GH-17220

show more ...

Merge branch 'PHP-8.4'

Merge branch 'PHP-8.3' into PHP-8.4

Fix GH-14709 overflow on recurrences for DatePeriod::__construct

close GH-14710

Merge branch 'PHP-8.4'

* PHP-8.4:
Fix GH-17190: Assertion failure ext/opcache/jit/ir/ir_gcm.c (#17221)

Fix GH-17190: Assertion failure ext/opcache/jit/ir/ir_gcm.c (#17221)

Merge branch 'PHP-8.4'

* PHP-8.4:
NEWS for GH-17168
ext/gettext/config.m4: symlink en_US.UTF-8 test bits to en_US for musl
ext/gettext/tests: fix libintl return values unde

Merge branch 'PHP-8.4'

* PHP-8.4:
NEWS for GH-17168
ext/gettext/config.m4: symlink en_US.UTF-8 test bits to en_US for musl
ext/gettext/tests: fix libintl return values under musl
ext/gettext/gettext.c: handle NULLs from bindtextdomain()

show more ...

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
NEWS for GH-17168
ext/gettext/config.m4: symlink en_US.UTF-8 test bits to en_US for musl
ext/gettext/tests: fix libintl retur

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
NEWS for GH-17168
ext/gettext/config.m4: symlink en_US.UTF-8 test bits to en_US for musl
ext/gettext/tests: fix libintl return values under musl
ext/gettext/gettext.c: handle NULLs from bindtextdomain()

show more ...

NEWS for GH-17168