Skip to content

[pull] master from php:master#832

Merged
pull[bot] merged 7 commits into
dolfly:masterfrom
php:master
Jun 18, 2026
Merged

[pull] master from php:master#832
pull[bot] merged 7 commits into
dolfly:masterfrom
php:master

Conversation

@pull

@pull pull Bot commented Jun 18, 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 : )

iliaal and others added 7 commits June 17, 2026 19:25
PS_VALIDATE_SID_FUNC(mm) was missing the semicolon after the
ps_mm_key_exists() assignment, so ext/session/mod_mm.c failed to compile
under --with-mm. The file is gated behind HAVE_LIBMM, so default builds
and CI never exercised it.

Closes GH-22336
php_zval_filter() copies the filtered value so it can be quoted in the
FilterFailedException message, then released the copy with
zend_string_delref(), which only decrements the refcount. When the input
is a non-string scalar that convert_to_string() turns into a fresh heap
string, the copy was the sole owner and leaked one string per call on
both the failure and the success path. Use zend_string_release() so it is
freed at refcount zero.

Closes GH-22339
* PHP-8.5:
  Fix leak of preserved input string with FILTER_THROW_ON_FAILURE
php_libxml_sniff_charset_from_string() advanced the parse cursor by the
parameter name length after collecting an unquoted parameter value
(WHATWG mime-sniff step 11.9.1), instead of the value length. When a
Content-Type parameter before charset had a name and value of different
lengths, the cursor misaligned and the charset parameter was missed, so
document loading fell back to the wrong encoding.

Closes GH-22343
* PHP-8.4:
  Fix MIME charset sniffing advancing by name length not value length
* PHP-8.5:
  Fix MIME charset sniffing advancing by name length not value length
…ed place to get help (#22333)

The discord server is now mostly used in discussion rather then the IRC channel.
Good to document it as a way to get help in CONTRIBUTING.md.
@pull pull Bot locked and limited conversation to collaborators Jun 18, 2026
@pull pull Bot added the ⤵️ pull label Jun 18, 2026
@pull pull Bot merged commit 9be7052 into dolfly:master Jun 18, 2026
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.

2 participants