diff options
author | Eric Wong <e@80x24.org> | 2021-09-16 09:41:16 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-09-16 20:09:40 +0000 |
commit | 7bef60341629a3fee09b30cd3dd2696550dad674 (patch) | |
tree | f2a1bf14e7dde627f6eeb4687e8a2f7c0789a075 /lib/PublicInbox/NetReader.pm | |
parent | b833e4095c6dab8d81bbcdedaddafa4b6a2a235c (diff) | |
download | public-inbox-7bef60341629a3fee09b30cd3dd2696550dad674.tar.gz |
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.
Diffstat (limited to 'lib/PublicInbox/NetReader.pm')
-rw-r--r-- | lib/PublicInbox/NetReader.pm | 5 |
1 files changed, 5 insertions, 0 deletions
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}; |