about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-02-06 11:07:40 +0000
committerEric Wong <e@80x24.org>2019-02-07 01:00:22 +0000
commite90e8b9548bee4abef01c1426db2541a01f8d003 (patch)
tree676e0def7cad43f743d67878ec58120f6a4b29c1
parent995933c8941ff6b3425483aad8fb0576a25cee1a (diff)
downloadpublic-inbox-e90e8b9548bee4abef01c1426db2541a01f8d003.tar.gz
We need to keep Unix-socket-only httpd instances working
without Socket6.  This fixes t/httpd-unix.t with Socket6
uninstalled.
-rw-r--r--lib/PublicInbox/Daemon.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 6aa4a194..033dd98a 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -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);