diff options
| author | Christian Persch <chpe@src.gnome.org> | 2022-02-03 22:19:57 +0100 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2022-02-03 22:24:56 +0100 |
| commit | c28d957d01029e264b498cd09315b366eb7b5fe2 (patch) | |
| tree | 6587586db377ba53f5829ba2816991f5c1af6b87 | |
| parent | 5caf874a311b49ebe7ecba46a021b8023c41f7e9 (diff) | |
| download | gnome-terminal-c28d957d01029e264b498cd09315b366eb7b5fe2.tar.gz | |
Revert "regex: Workaround a PCRE bug resulting in not recognizing schemeless URLs"
This reverts commit bb808a756935adbdf2bf950ae100c907374292b9.
| -rw-r--r-- | src/terminal-regex.hh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/terminal-regex.hh b/src/terminal-regex.hh index da1d6d6b..465df772 100644 --- a/src/terminal-regex.hh +++ b/src/terminal-regex.hh @@ -150,11 +150,7 @@ /* TODO: also support file:/etc/passwd */ #define REGEX_URL_FILE DEFS "(?ix: file:/ (?: / (?: " HOSTNAME1 " )? / )? (?! / ) )(?&PATH)" /* Lookbehind so that we don't catch "abc.www.foo.bar", bug 739757. Lookahead for www/ftp for convenience (so that we can reuse HOSTNAME1). */ -/* The commented-out variant looks more like our other definitions, but fails with PCRE 10.34. See GNOME/gnome-terminal#221. - * TODO: revert to this nicer pattern some time after 10.35's release. - * #define REGEX_URL_HTTP DEFS "(?<!(?:" HOSTNAMESEGMENTCHARS_CLASS "|[.]))(?=(?i:www|ftp))" HOSTNAME1 PORT URLPATH - */ -#define REGEX_URL_HTTP APOS_START_DEF "(?<!(?:" HOSTNAMESEGMENTCHARS_CLASS "|[.]))(?=(?i:www|ftp))" HOSTNAME1 PORT PATH_INNER_DEF PATH_DEF URLPATH +#define REGEX_URL_HTTP DEFS "(?<!(?:" HOSTNAMESEGMENTCHARS_CLASS "|[.]))(?=(?i:www|ftp))" HOSTNAME1 PORT URLPATH #define REGEX_URL_VOIP DEFS "(?i:h323:|sips?:)" USERPASS URL_HOST PORT VOIP_PATH #define REGEX_EMAIL DEFS "(?i:mailto:)?" USER "@" EMAIL_HOST #define REGEX_NEWS_MAN "(?i:news:|man:|info:)[-[:alnum:]\\Q^_{|}~!\"#$%&'()*+,./;:=?`\\E]+" |