[PATCH 0/2] a few more POP3 bits

[PATCH 0/2] a few more POP3 bits

[Eric Wong]

2147483647 processes should be enough for anybody (right?)

Eric Wong (2):
  www: inbox: favor "pop3://" over "pop://"
  pop3d: enable native fcntl locks on all *BSDs

 lib/PublicInbox/Inbox.pm | 4 ++--
 lib/PublicInbox/POP3D.pm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

[PATCH 1/2] www: inbox: favor "pop3://" over "pop://"

[Eric Wong]

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.
---
 lib/PublicInbox/Inbox.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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);
 		}

[PATCH 2/2] pop3d: enable native fcntl locks on all *BSDs

[Eric Wong]

...as we've already done for the simpler case of mbox locking in lei.
I've just confirmed NetBSD and OpenBSD share the same "struct flock"
with FreeBSD, and assume DragonflyBSD is the same.  sizeof(pid_t) == 4
in all places I've checked, and it's unlikely we'll need 64-bit
pid_t any time soon...
---
 lib/PublicInbox/POP3D.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/POP3D.pm b/lib/PublicInbox/POP3D.pm
index 7432a964..8aa16907 100644
--- a/lib/PublicInbox/POP3D.pm
+++ b/lib/PublicInbox/POP3D.pm
@@ -14,7 +14,7 @@ use PublicInbox::Syscall;
 use File::Temp 0.19 (); # 0.19 for ->newdir
 use Fcntl qw(F_SETLK F_UNLCK F_WRLCK SEEK_SET);
 my @FLOCK;
-if ($^O eq 'linux' || $^O eq 'freebsd') {
+if ($^O eq 'linux' || $^O =~ /bsd/) {
 	require Config;
 	my $off_t;
 	my $sz = $Config::Config{lseeksize};
@@ -27,7 +27,7 @@ if ($^O eq 'linux' || $^O eq 'freebsd') {
 		if ($^O eq 'linux') {
 			@FLOCK = ("ss\@8$off_t$off_t\@32",
 				qw(l_type l_whence l_start l_len));
-		} elsif ($^O eq 'freebsd') {
+		} elsif ($^O eq /bsd/) {
 			@FLOCK = ("${off_t}${off_t}lss\@256",
 				qw(l_start l_len l_pid l_type l_whence));
 		}

Re: [PATCH 2/2] pop3d: enable native fcntl locks on all *BSDs

[Eric Wong]

Eric Wong <e@80x24.org> wrote:
> --- a/lib/PublicInbox/POP3D.pm
> +++ b/lib/PublicInbox/POP3D.pm
> @@ -27,7 +27,7 @@ if ($^O eq 'linux' || $^O eq 'freebsd') {
>  		if ($^O eq 'linux') {
>  			@FLOCK = ("ss\@8$off_t$off_t\@32",
>  				qw(l_type l_whence l_start l_len));
> -		} elsif ($^O eq 'freebsd') {
> +		} elsif ($^O eq /bsd/) {
>  			@FLOCK = ("${off_t}${off_t}lss\@256",
>  				qw(l_start l_len l_pid l_type l_whence));
>  		}

Erm..., will squash the patch below in :x

diff --git a/lib/PublicInbox/POP3D.pm b/lib/PublicInbox/POP3D.pm
index 8aa16907..3fc85efc 100644
--- a/lib/PublicInbox/POP3D.pm
+++ b/lib/PublicInbox/POP3D.pm
@@ -27,7 +27,7 @@ if ($^O eq 'linux' || $^O =~ /bsd/) {
 		if ($^O eq 'linux') {
 			@FLOCK = ("ss\@8$off_t$off_t\@32",
 				qw(l_type l_whence l_start l_len));
-		} elsif ($^O eq /bsd/) {
+		} elsif ($^O =~ /bsd/) {
 			@FLOCK = ("${off_t}${off_t}lss\@256",
 				qw(l_start l_len l_pid l_type l_whence));
 		}