Skip to content

[pull] master from php:master - #1135

Merged
pull[bot] merged 20 commits into
turkdevops:masterfrom
php:master
Jul 30, 2026
Merged

[pull] master from php:master#1135
pull[bot] merged 20 commits into
turkdevops:masterfrom
php:master

Conversation

@pull

@pull pull Bot commented Jul 30, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

Girgias and others added 20 commits July 30, 2026 09:45
As this is the expected type for lineno everywhere else in the engine
This remove a strlen() computation.

While at it clarify path concatenation code by using the zend_string_concat{2|3} APIs rather than a memcpy and strncpy calls
Allows us to convert a strcmp() call to zend_string_equals_literal() which is less confusing
Instead of the old way of logging errors and displaying them use the new APIs.
This should never happen in the first place
php_json_encode_array() reads a hooked property into a local zval and
bails out when an exception is pending. The get hook can publish its
return value into that zval and then throw while its frame is freed,
for example from the destructor of one of its locals, so the bailout
leaks the value until request shutdown. Destroy it on the way out, the
way the other failure exit already does.

Closes GH-22919
* PHP-8.4:
  Free the hooked property value when json_encode() sees an exception
Prevents some reallocations and strlen() recomputations
* PHP-8.5:
  Free the hooked property value when json_encode() sees an exception
Avoids creating 70,000 files on platforms unaffected by the Win32 DIR_W32.offset regression. Shaves ~9s off non-Windows test runs.
* Clean up IPC objects in arginfo mismatch test

* Fix GH-16592 test leaking a message queue
@pull pull Bot locked and limited conversation to collaborators Jul 30, 2026
@pull pull Bot added the ⤵️ pull label Jul 30, 2026
@pull
pull Bot merged commit 61a190c into turkdevops:master Jul 30, 2026
0 of 2 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants