From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 4B36C1F54E for ; Thu, 4 Aug 2022 06:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1659594459; bh=5I37pD8AkrURTg90fIDMwKNFn2UwXrfrOleA+XeCRM0=; h=From:To:Subject:Date:From; b=EM/xDfUvy4nPsp4NctaiUVI6Z2htAFBDM948kqq1y/yzztblvcV+3Rt5avB4Hzk7V W2McshMSUar1Ek/ZpEfQ6RDP9/N7lQbLHLAHmlOEE96Lo8hAXxBMDY8c8Ib5xfFxcu rXHAIRd6zalG3QxjoBLL502gyjD7RiNViGD4j6LA= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] daemon: handle per-listener options on inherited, well-known ports Date: Thu, 4 Aug 2022 06:27:39 +0000 Message-Id: <20220804062739.6786-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We must not clobber already-parsed per-listener options when handling inherited sockets which are well-known. Unfortunately, this isn't easy to test in a non-intrusive way for regular users. --- 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 67b26d2e..86234771 100644 --- a/lib/PublicInbox/Daemon.pm +++ b/lib/PublicInbox/Daemon.pm @@ -261,10 +261,10 @@ EOF for my $sockname (@inherited_names) { $sockname =~ /:([0-9]+)\z/ or next; if (my $scheme = $KNOWN_TLS{$1}) { - $xnetd->{$sockname} = load_mod($scheme); + $xnetd->{$sockname} //= load_mod($scheme); $tls_opt{"$scheme://$sockname"} ||= accept_tls_opt(''); } elsif (($scheme = $KNOWN_STARTTLS{$1})) { - $xnetd->{$sockname} = load_mod($scheme); + $xnetd->{$sockname} //= load_mod($scheme); $tls_opt{"$scheme://$sockname"} ||= accept_tls_opt(''); $tls_opt{''} ||= accept_tls_opt(''); }