Skip to content

[pull] master from php:master - #1309

Merged
pull[bot] merged 13 commits into
turkdevops:masterfrom
php:master
Sep 26, 2026
Merged

pull[bot] merged 13 commits into
turkdevops:masterfrom
php:master

Conversation

@pull

@pull pull Bot commented Sep 26, 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 : )

adapik and others added 13 commits September 26, 2026 18:03
Drive-by removal of unused `ext/standard/base64.h` import.
…quired

pcntl_setcpuaffinity() refuses a cpu id equal to the cpu count but named
that count as the inclusive upper bound, printing a zend_long with the
unsigned format on the way. pcntl_setqos_class() declares $qos_class
optional while its parser demanded it, leaving the declared default
unreachable.

Close GH-23553
* PHP-8.4:
  ext/pcntl: fix an off by one bound and a parameter the parser made required
* PHP-8.5:
  ext/pcntl: fix an off by one bound and a parameter the parser made required

# Conflicts:
#	ext/pcntl/pcntl.c
* PHP-8.6:
  ext/pcntl: fix an off by one bound and a parameter the parser made required
The shutdown function tried to reset the session state even when the
connection had failed.

Regression from GH-20572.

Close GH-23922
* PHP-8.6:
  ext/pdo_pgsql: Fix crash when a persistent connection fails
Since 6600d0e the message was unconditionally prefixed with
get_active_function_or_method_name(), which asserts zend_is_executing() and
dereferences a null EG(current_execute_data) in a release build. A UConverter
subclass destroyed at request shutdown reached it through ucnv_close(). Fall
back to the unprefixed message when there is no frame.

Close GH-23673
* PHP-8.5:
  ext/intl: intl_error_set_custom_msg() crash without an active call frame
* PHP-8.6:
  ext/intl: intl_error_set_custom_msg() crash without an active call frame
…ort test

The test resets the connection as soon as it is opened, so the reset could
reach the server while the connection was still in the listen backlog. The
server then never saw the request and the expected error was never logged.

Complete a request on a second connection first: the accept queue is FIFO,
so a response on the later connection means the earlier one has been
accepted, and the reset is guaranteed to hit an established connection.

Close GH-23841
497fdf2 was committed with a [skip ci] prefix by mistake, so the fixed
php_cli_server_expect_100_continue_iua.phpt never ran in CI. This empty
commit makes CI run it.
@pull pull Bot locked and limited conversation to collaborators Sep 26, 2026
@pull pull Bot added the ⤵️ pull label Sep 26, 2026
@pull
pull Bot merged commit 267c6dc into turkdevops:master Sep 26, 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