unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
* [PATCH] daemon: handle per-listener options on inherited, well-known ports
@ 2022-08-04  6:27 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2022-08-04  6:27 UTC (permalink / raw)
  To: meta

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('');
 		}

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-08-04  6:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-04  6:27 [PATCH] daemon: handle per-listener options on inherited, well-known ports Eric Wong

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).