Fix URL matching for domain names with port numbers in string replacer#10105
Merged
alecpl merged 1 commit intoroundcube:masterfrom Mar 8, 2026
Merged
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
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.
Since commit 2c3b46c ("Fix regression in handling of non-unicode characters in a plain text message"), URLs with domain names and port numbers (e.g.
http://example.com:8080/path) are no longer converted into links in plain text messages.The port number pattern
(:[0-9]{1,5})?in$link_patternwas placed inside the$ip_addressbranch only:Since
:is excluded from$utf_domain, domain-name URLs stop matching at the colon and the port number is lost.This moves
(:[0-9]{1,5})?outside both branches so it applies to both IP addresses and domain names:The existing test case
http://link.com:testis unaffected because:testdoes not match[0-9]{1,5}.Added test cases for domain-name URLs with port numbers.