From: Eric Wong <e@80x24.org>
Date: Thu, 16 Sep 2021 09:41:16 +0000 (+0000)
Subject: net_reader: load IO::Socket::Socks in all workers
X-Git-Tag: v1.7.0~362
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=7bef60341629a3fee09b30cd3dd2696550dad674;p=public-inbox.git

net_reader: load IO::Socket::Socks in all workers

This was previously undetected since SOCKS is mainly used for
read-only (single worker) tasks, and worker[0] always loaded
the module.  However, "lei refresh-mail-sync" can bounce reads
to any worker, so we need to ensure worker[1..Inf] load it, too.
---

diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index abcb5d2f..5725a155 100644
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -35,6 +35,7 @@ sub socks_args ($) {
 		eval { require IO::Socket::Socks } or die <<EOM;
 IO::Socket::Socks missing for socks5h://$h:$p
 EOM
+		# for Mail::IMAPClient
 		return { ProxyAddr => $h, ProxyPort => $p };
 	}
 	die "$val not understood (only socks5h:// is supported)\n";
@@ -45,6 +46,10 @@ sub mic_new ($$$$) {
 	my %mic_arg = %$mic_arg;
 	my $sa = $self->{cfg_opt}->{$sec}->{-proxy_cfg} || $self->{-proxy_cli};
 	if ($sa) {
+		# this `require' needed for worker[1..Inf], since socks_args
+		# only got called in worker[0]
+		require IO::Socket::Socks;
+
 		my %opt = %$sa;
 		$opt{ConnectAddr} = delete $mic_arg{Server};
 		$opt{ConnectPort} = delete $mic_arg{Port};