Do not apply IDNA conversion to RegEx domains #2336
Merged
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.
What does this PR aim to accomplish?:
Fixes #2335.
When adding domains to the database we do a
convertUnicodeToIDNA
before. However, this is not needed for RegEx and can instead lead to side effects seen in the linked issue. This PR moves the conversion into the already existingif
clause that only triggers if no RegEx is added.P.S. The used
PHP
functionidn_to_ascii
does not convert "invalid" domains but instead returnsfalse
which will add an empty domain to the databaseBy submitting this pull request, I confirm the following:
git rebase
)