Skip to content

Conversation

@Ayesh
Copy link
Member

@Ayesh Ayesh commented Jun 7, 2024

Previously: GH-13413.

This version also contains a fix with preg_match('\X'), so that it can correctly detect grapheme clusters (PCRE2Project/pcre2#410). This is useful to correctly polyfill the new grapheme_str_split function.

Diff: pcre2lib v10.43..v10.44

@devnexen devnexen requested a review from ndossche June 7, 2024 17:45
Copy link
Member

@ndossche ndossche left a comment

Choose a reason for hiding this comment

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

Thanks, the only thing that's missing is the change in the pcre2.h header to include pcre2_set_max_pattern_compiled_length. See the diff of pcre2.h.{in,generic}

@Ayesh Ayesh force-pushed the pcre2-1044 branch 2 times, most recently from a7f2057 to 106b387 Compare June 8, 2024 07:51
@Ayesh
Copy link
Member Author

Ayesh commented Jun 8, 2024

Thank you for catching it @nielsdos. I merged changes from from upstream pcre2.h.generic to our pcre2.h. Also added an entry in the NEWS file.

Previously: phpGH-13413.

This version also contains a fix with `preg_match('\X')`, so that it
can correctly detect grapheme clusters (PCRE2Project/pcre2#410).
This is useful to correctly [polyfill the new `grapheme_str_split`
function](https://php.watch/versions/8.4/grapheme_str_split#polyfill).

Diff: pcre2lib [v10.43..v10.44](PCRE2Project/pcre2@pcre2-10.43...pcre2-10.44)
Copy link
Member

@ndossche ndossche left a comment

Choose a reason for hiding this comment

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

LGTM, thanks

@ndossche ndossche merged commit d1f14a4 into php:master Jun 8, 2024
@Ayesh
Copy link
Member Author

Ayesh commented Jun 8, 2024

Thank you!

@Ayesh Ayesh deleted the pcre2-1044 branch June 8, 2024 11:10
Ayesh added a commit to Ayesh/php-src that referenced this pull request Jun 8, 2024
In phpGH-14498, we updated pcre2lib to v10.44. However, it missed syncing the config,
that changes upstream `MAX_NAME_SIZE` from 32 to 128.

Ref: [1](PCRE2Project/pcre2@ced3b0f#diff-91c5b46dc84a94604a4e4d0caed9bf85590a2eddbb12d2e8dc80badf324a9dfb), [2](PCRE2Project/pcre2@6c670c7)
ndossche pushed a commit that referenced this pull request Jun 8, 2024
In GH-14498, we updated pcre2lib to v10.44. However, it missed syncing the config,
that changes upstream `MAX_NAME_SIZE` from 32 to 128.

Ref: [1](PCRE2Project/pcre2@ced3b0f#diff-91c5b46dc84a94604a4e4d0caed9bf85590a2eddbb12d2e8dc80badf324a9dfb), [2](PCRE2Project/pcre2@6c670c7)
@mvorisek mvorisek mentioned this pull request Sep 11, 2025
17 tasks
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