update copyrights for 2018

[public-inbox.git] / lib / PublicInbox / Listener.pm

diff --git a/lib/PublicInbox/Listener.pm b/lib/PublicInbox/Listener.pm
index 8e0554f377e32e603e10dd6ec84aec2d691244b9..52894cb3b4995a6a142e271789a07552d0342e8f 100644 (file)
--- a/lib/PublicInbox/Listener.pm
+++ b/lib/PublicInbox/Listener.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used by -nntpd for listen sockets
 package PublicInbox::Listener;
@@ -13,7 +13,7 @@ require IO::Handle;
 sub new ($$$) {
        my ($class, $s, $cb) = @_;
        setsockopt($s, SOL_SOCKET, SO_KEEPALIVE, 1);
-       setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1);
+       setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1); # ignore errors on non-TCP
        listen($s, 1024);
        IO::Handle::blocking($s, 0);
        my $self = fields::new($class);
@@ -25,11 +25,16 @@ sub new ($$$) {
 
 sub event_read {
        my ($self) = @_;
+       my $sock = $self->{sock};
+
        # no loop here, we want to fairly distribute clients
        # between multiple processes sharing the same socket
-       if (my $addr = accept(my $c, $self->{sock})) {
+       # XXX our event loop needs better granularity for
+       # a single accept() here to be, umm..., acceptable
+       # on high-traffic sites.
+       if (my $addr = accept(my $c, $sock)) {
                IO::Handle::blocking($c, 0); # no accept4 :<
-               $self->{post_accept}->($c, $addr);
+               $self->{post_accept}->($c, $addr, $sock);
        }
 }