From: Eric Wong <e@80x24.org>
Date: Thu, 11 Aug 2022 20:00:20 +0000 (+0000)
Subject: www: inbox: favor "pop3://" over "pop://"
X-Git-Tag: v1.9.0~28
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=132060cd24f640bb053406fcfa9a48d75589cac2;p=public-inbox.git

www: inbox: favor "pop3://" over "pop://"

curl only supports "pop3://" and "pop3s://", despite RFC 2384
existing for "pop://".  AFAIK, there's no RFCs for "pop3://"
and "pop3s://", but please let us know if there are.

In any case, real-world cases like curl are more relevant.
---

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 3f70e69d..1f7f982d 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -285,9 +285,9 @@ sub pop3_url {
 		my $group = $self->{newsgroup};
 		my @urls;
 		($ps && $group) and
-			@urls = map { m!\Apops?://! ? $_ : "pop://$_" } @$ps;
+			@urls = map { m!\Apop3?s?://! ? $_ : "pop3://$_" } @$ps;
 		if (my $mi = $self->{'pop3mirror'}) {
-			my @m = map { m!\Apops?://! ? $_ : "pop://$_" } @$mi;
+			my @m = map { m!\Apop3?s?://! ? $_ : "pop3://$_" } @$mi;
 			my %seen; # List::Util::uniq requires Perl 5.26+
 			@urls = grep { !$seen{$_}++ } (@urls, @m);
 		}