Skip to content

lexbor: Merge upstream fixes - #23660

Closed
alexandre-daubois wants to merge 1 commit into
php:PHP-8.5from
alexandre-daubois:lexbor-fix-8.5
Closed

alexandre-daubois wants to merge 1 commit into
php:PHP-8.5from
alexandre-daubois:lexbor-fix-8.5

Conversation

@alexandre-daubois

@alexandre-daubois alexandre-daubois commented Sep 11, 2026 •

Copy link
Copy Markdown
Member

Once this one and #23659 are merged, I'll have a look to actually bump lexbor to 3.0.1 on master.

@alexandre-daubois alexandre-daubois changed the title lexbor: Merge upstream memory safety fixes 859f100, 8a14bc0, f67ce4b and b0f7412 lexbor: Merge upstream fixes (8.5) Sep 11, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

FWIW: Historically we didn't add tests for upstream issues (because the fix is already tested upstream), so for all I care these can be dropped.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

FWIW: I'm happy with these tests, because these make sure that no matter which library or library version we use under the hood, the asserted edge cases satisfy the related specifications, and most tests already check lexbor's and uriparser's own behavior, not just the php-src integration.

Comment thread ext/uri/tests/whatwg/parsing/host_success_multibyte_long.phpt
@kocsismate

Copy link
Copy Markdown
Member

@alexandre-daubois FYI: lexbor/lexbor#396 is another candidate which should also land when merged.

@alexandre-daubois

Copy link
Copy Markdown
Member Author

Thanks Máté! Keeping an eye on it

@alexandre-daubois

Copy link
Copy Markdown
Member Author

I subscribed to your PRs, I'll update everything once the two last are merged 👍

@alexandre-daubois alexandre-daubois changed the title lexbor: Merge upstream fixes (8.5) lexbor: Merge upstream fixes Sep 14, 2026
@alexandre-daubois
alexandre-daubois force-pushed the lexbor-fix-8.5 branch 2 times, most recently from d7699bd to 7ec1992 Compare September 14, 2026 11:58
@kocsismate

Copy link
Copy Markdown
Member

(I've just added two more PRs to the list above)

@alexandre-daubois

Copy link
Copy Markdown
Member Author

@kocsismate is lexbor/lexbor#396 the last one or you'd like to embed other PRs?

@alexandre-daubois
alexandre-daubois force-pushed the lexbor-fix-8.5 branch 2 times, most recently from 15d4247 to e243135 Compare October 5, 2026 12:21
lexbor/lexbor@859f100
lexbor/lexbor@a36e09a
lexbor/lexbor@b0f7412
lexbor/lexbor@1b215a8
lexbor/lexbor@385afff
lexbor/lexbor@e6c068f
lexbor/lexbor@327a8b6
lexbor/lexbor@917742f
lexbor/lexbor@e89c258

Only the source/lexbor/url part of lexbor/lexbor@327a8b6 and
lexbor/lexbor@e89c258 is carried: the first squash also contains unrelated
HTML tree construction changes, and the second documents a percent-encoder
API that this branch does not bundle.
@kocsismate

Copy link
Copy Markdown
Member

@alexandre-daubois Yes, that's the last one. Likely, it won't be merged directly, as the author expressed in this comment: lexbor/lexbor#396 (comment) It's also OK to merge your changes without that one, and we could add it later (maybe only for master).

@alexandre-daubois

Copy link
Copy Markdown
Member Author

Alright, I'll take care of (up)merging this one soon. Feel free to ping me wherever relevant 🙂

@alexandre-daubois

alexandre-daubois commented Oct 6, 2026 •

Copy link
Copy Markdown
Member Author

Merge done! Closed by beee544

bukka pushed a commit to bukka/php-src that referenced this pull request Oct 7, 2026
After lexbor/lexbor#415 was merged to Lexbor and the change was applied to ext/lexbor via php#23660, the temporary functions can be replaced with their counterpart in Lexbor.
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.

3 participants