ext/pcre: Add "/r" modifier #13583
Merged
ext/pcre: Add "/r" modifier #13583
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds support for "Caseless restricted" matching added in PCRE2lib 10.43 with the "r" modifier. This is `PCRE2_EXTRA_CASELESS_RESTRICT` in PCRE2. This is an "extra" option, which means it is not possible to pass this option as pcre2_compile() function parameter. This option is passed in a pcre2_set_compile_extra_options() call. Previously, these extra options are set at php_pcre_init_pcre2(), but after this change, it is possible to customize the options by adding bits to `eoptions` in pcre_get_compiled_regex_cache_ex(). The tests for this change are ported from upstream test suite[^1]. [^1]: PCRE2Project/pcre2@c13d54f6581#diff-8c8312e4eb2d35bb16485404b7b5cc0eaef0bca1aa95ff5febf6a1890048305c
devnexen
reviewed
Mar 10, 2024
| @@ -722,6 +723,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, bo | |||
| /* PCRE specific options */ | |||
| case 'A': coptions |= PCRE2_ANCHORED; break; | |||
| case 'D': coptions |= PCRE2_DOLLAR_ENDONLY;break; | |||
| case 'r': eoptions |= PCRE2_EXTRA_CASELESS_RESTRICT; break; | |||
There was a problem hiding this comment.
might need to be done conditionally, break with --with-external-pcre with older pcre2 version.
There was a problem hiding this comment.
Good catch; do you prepare a PR or do I?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds support for "Caseless restricted" matching added in PCRE2lib 10.43 with the "r" modifier.
This is
PCRE2_EXTRA_CASELESS_RESTRICTin PCRE2. This is an "extra" option, which means it is not possible to pass this option as pcre2_compile() function parameter.This option is passed in a pcre2_set_compile_extra_options() call. Previously, these extra options are set at php_pcre_init_pcre2(), but after this change, it is possible to customize the options by adding bits to
eoptionsin pcre_get_compiled_regex_cache_ex().The tests for this change are ported from upstream test suite1.
Footnotes
https://github.com/PCRE2Project/pcre2/commit/c13d54f6581#diff-8c8312e4eb2d35bb16485404b7b5cc0eaef0bca1aa95ff5febf6a1890048305c ↩