Page MenuHomePhabricator
Files F15404086

D21562.id51331.diff
No OneTemporary
Actions

D21562.id51331.diff
View Options

diff --git a/src/infrastructure/markup/markuprule/PhutilRemarkupHyperlinkRule.php b/src/infrastructure/markup/markuprule/PhutilRemarkupHyperlinkRule.php
--- a/src/infrastructure/markup/markuprule/PhutilRemarkupHyperlinkRule.php
+++ b/src/infrastructure/markup/markuprule/PhutilRemarkupHyperlinkRule.php
@@ -9,18 +9,47 @@
}
public function apply($text) {
+ static $angle_pattern;
+ static $curly_pattern;
+ static $bare_pattern;
+
+ if ($angle_pattern === null) {
+ // See T13608. Limit protocol matches to 32 characters to improve the
+ // performance of the "<protocol>://" pattern, which can take a very long
+ // time to match against long inputs if the maximum length of a protocol
+ // sequence is unrestricted.
+
+ $protocol_fragment = '\w{3,32}';
+ $uri_fragment = '[^\s'.PhutilRemarkupBlockStorage::MAGIC_BYTE.']+';
+
+ $angle_pattern = sprintf(
+ '(<(%s://%s?)>)',
+ $protocol_fragment,
+ $uri_fragment);
+
+ $curly_pattern = sprintf(
+ '({(%s://%s?)})',
+ $protocol_fragment,
+ $uri_fragment);
+
+ $bare_pattern = sprintf(
+ '(%s://%s)',
+ $protocol_fragment,
+ $uri_fragment);
+ }
+
// Hyperlinks with explicit "<>" around them get linked exactly, without
// the "<>". Angle brackets are basically special and mean "this is a URL
// with weird characters". This is assumed to be reasonable because they
- // don't appear in normal text or normal URLs.
+ // don't appear in most normal text or most normal URLs.
$text = preg_replace_callback(
- '@<(\w{3,}://[^\s'.PhutilRemarkupBlockStorage::MAGIC_BYTE.']+?)>@',
+ $angle_pattern,
array($this, 'markupHyperlinkAngle'),
$text);
// We match "{uri}", but do not link it by default.
$text = preg_replace_callback(
- '@{(\w{3,}://[^\s'.PhutilRemarkupBlockStorage::MAGIC_BYTE.']+?)}@',
+ $curly_pattern,
array($this, 'markupHyperlinkCurly'),
$text);
@@ -31,8 +60,9 @@
// NOTE: We're explicitly avoiding capturing stored blocks, so text like
// `http://www.example.com/[[x | y]]` doesn't get aggressively captured.
+
$text = preg_replace_callback(
- '@(\w{3,}://[^\s'.PhutilRemarkupBlockStorage::MAGIC_BYTE.']+)@',
+ $bare_pattern,
array($this, 'markupHyperlinkUngreedy'),
$text);
@@ -110,7 +140,7 @@
}
protected function markupHyperlinkUngreedy($matches) {
- $match = $matches[1];
+ $match = $matches[0];
$tail = null;
$trailing = null;
if (preg_match('/[;,.:!?]+$/', $match, $trailing)) {

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 19, 6:09 AM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7710919
Default Alt Text
D21562.id51331.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility