646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
Based on https://github.com/thestinger/termite/pull/516
|
|
Modified to apply to v13
|
|
|
|
From 65a454ffa8e681f3f14729cba7c42e1570a85e8a Mon Sep 17 00:00:00 2001
|
|
From: Paul Baecher <pbaecher@gmail.com>
|
|
Date: Thu, 7 Sep 2017 22:58:51 +0200
|
|
Subject: [PATCH] Do not match punctuation at the end of URLs
|
|
|
|
Punctuation at the end of URLs is most likely part of natural language
|
|
or markup (for example in Markdown). Do not match it as part of the URL.
|
|
---
|
|
url_regex.hh | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/url_regex.hh b/url_regex.hh
|
|
index 2ec6be8..3039b53 100644
|
|
--- a/url_regex.hh
|
|
+++ b/url_regex.hh
|
|
@@ -9,7 +9,7 @@
|
|
#define PORT "(?:\\:[[:digit:]]{1,5})?"
|
|
#define SCHEME "(?:[[:alpha:]][+-.[:alnum:]]*:)"
|
|
#define USERPASS USERCHARS_CLASS "+(?:\\:" PASSCHARS_CLASS "+)?"
|
|
-#define URLPATH "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*)?"
|
|
+#define URLPATH "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*(?<![\\Q.,:;()!?\\E]))?"
|
|
|
|
const char * const url_regex = SCHEME "//(?:" USERPASS "\\@)?" HOST PORT URLPATH;
|
|
|