From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/2] daemon: die properly when Socket6 is missing
Date: Wed, 6 Feb 2019 11:07:40 +0000 [thread overview]
Message-ID: <20190206110741.30661-2-e@80x24.org> (raw)
In-Reply-To: <20190206110741.30661-1-e@80x24.org>
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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 6aa4a19..033dd98 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);
--
EW
next prev parent reply other threads:[~2019-02-06 11:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-06 11:07 [PATCH 0/2] try harder to avoid Socket6 dependency Eric Wong
2019-02-06 11:07 ` Eric Wong [this message]
2019-02-06 11:07 ` [PATCH 2/2] daemon: favor Socket.pm in Perl 5.14+ for IPv6 Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190206110741.30661-2-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).