Skip to content

Conversation

@TimWolla
Copy link
Member

@TimWolla TimWolla commented Dec 8, 2025

This is in preparation of importing a fix for the uriparser/uriparser#282 security issue, which will likely depend on this refactoring to cleanly apply.


Release Managers: This should likely be cherry-picked for PHP-8.5.1 due to the aforementioned security issue. I will import the upstream fix in a separate PR once it's fully reviewed.

This is in preparation of importing a fix for the uriparser/uriparser#282
security issue, which will likely depend on this refactoring to cleanly apply.
@TimWolla TimWolla requested review from a team and ndossche December 8, 2025 20:08
@TimWolla TimWolla requested a review from kocsismate as a code owner December 8, 2025 20:08
Copy link
Member

@DanielEScherzer DanielEScherzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technical review not performed
RM approval is not needed for merging into PHP-8.5 at this point
To include in PHP-8.5.1 I'll leave that up to @edorian since they are managing that point release

@ndossche
Copy link
Member

ndossche commented Dec 8, 2025

Checked against uriparser/uriparser@f47a7f0 seems okay.
Commit title appears to have a typo however: it says gf47a7f0 ? Also not sure where the 79 is coming from in 0.9.9-79.

@TimWolla
Copy link
Member Author

TimWolla commented Dec 8, 2025

Commit title appears to have a typo however: it says gf47a7f0 ? Also not sure where the 79 is coming from in 0.9.9-79.

That's the output of git describe. The g is a fixed character standing for “git” and the 79 is the number of commits the commit is ahead of the tag 0.9.9. I used the same commit message format in 8a0c300 and 1ca78dd.

@bukka
Copy link
Member

bukka commented Dec 9, 2025

@TimWolla Please can you merge it so it gets to the RC2... @edorian can then cherry pick it

@TimWolla TimWolla merged commit 8fd69e1 into php:PHP-8.5 Dec 9, 2025
10 checks passed
TimWolla added a commit that referenced this pull request Dec 9, 2025
* PHP-8.5:
  uri: Update to uriparser-0.9.9-79-gf47a7f0 (#20671)
@TimWolla TimWolla deleted the uriparser-update branch December 9, 2025 10:53
edorian pushed a commit that referenced this pull request Dec 9, 2025
This is in preparation of importing a fix for the uriparser/uriparser#282
security issue, which will likely depend on this refactoring to cleanly apply.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants