From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] linkify: support proto://hostname without trailing slash
Date: Fri, 1 Feb 2019 07:51:03 +0000 [thread overview]
Message-ID: <20190201075103.23547-1-e@80x24.org> (raw)
Sometimes users will write "http://example.com" without the
trailing slash, which every browser and tool I've tested seems
to understand.
---
lib/PublicInbox/Linkify.pm | 5 +++--
t/linkify.t | 9 +++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index 274f382..aa472cd 100644
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -16,11 +16,12 @@ use Digest::SHA qw/sha1_hex/;
my $SALT = rand;
my $LINK_RE = qr{(\()?\b((?:ftps?|https?|nntps?|gopher)://
- [\@:\w\.-]+/
+ [\@:\w\.-]+(?:/
(?:[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]*)
(?:\?[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]+)?
(?:\#[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%\?]+)?
- )}xi;
+ )?
+ )}xi;
sub new { bless {}, $_[0] }
diff --git a/t/linkify.t b/t/linkify.t
index a55ed22..f0b3a6d 100644
--- a/t/linkify.t
+++ b/t/linkify.t
@@ -14,6 +14,15 @@ use PublicInbox::Linkify;
is($s, qq(<a\nhref="$u">$u</a>.), 'trailing period not in URL');
}
+{
+ my $l = PublicInbox::Linkify->new;
+ my $u = 'http://i-forgot-trailing-slash.example.com';
+ my $s = $u;
+ $s = $l->linkify_1($s);
+ $s = $l->linkify_2($s);
+ is($s, qq(<a\nhref="$u">$u</a>), 'missing trailing slash OK');
+}
+
# handle URLs in parenthesized statements
{
my $l = PublicInbox::Linkify->new;
--
EW
reply other threads:[~2019-02-01 7:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190201075103.23547-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).