]> Sergey Matveev's repositories - public-inbox.git/commitdiff
daemon: die properly when Socket6 is missing
authorEric Wong <e@80x24.org>
Wed, 6 Feb 2019 11:07:40 +0000 (11:07 +0000)
committerEric Wong <e@80x24.org>
Thu, 7 Feb 2019 01:00:22 +0000 (01:00 +0000)
We need to keep Unix-socket-only httpd instances working
without Socket6.  This fixes t/httpd-unix.t with Socket6
uninstalled.

lib/PublicInbox/Daemon.pm

index 6aa4a1943044ca4002eb38e84e0c470b7e734058..033dd98ae4bc22abaf156c603e16ac9b0febfe44 100644 (file)
@@ -241,8 +241,8 @@ sub unpack_ipv6 ($) {
        # (perl-modules-5.24 in Debian)
 
        # SpamAssassin and Net::Server use Socket6, so it may be installed
-       # on our system, already:
-       eval { require Socket6 } or return ('???-Socket6-missing', 0);
+       # on our system, already (otherwise die):
+       require Socket6;
 
        my ($port, $host) = Socket6::unpack_sockaddr_in6($addr);
        $host = Socket6::inet_ntop(Socket6::AF_INET6(), $host);