From 91460992d22dcb3fa8c02d245fb480b31a64cb0b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 9 Sep 2021 05:25:00 +0000 Subject: [PATCH] net_reader: preserve memoized IMAPClient arg for SOCKS Multiple invocations of mic_new may happen in long-lived processes, so do not let mic_new make irreversible changes to the cached args when using a SOCKS proxy. --- lib/PublicInbox/NetReader.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index 9faa362c..5199a3a3 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -42,16 +42,16 @@ EOM sub mic_new ($$$$) { my ($self, $mic_arg, $sec, $uri) = @_; - my %socks; + my %mic_arg = %$mic_arg; my $sa = $self->{imap_opt}->{$sec}->{-proxy_cfg} || $self->{-proxy_cli}; if ($sa) { my %opt = %$sa; - $opt{ConnectAddr} = delete $mic_arg->{Server}; - $opt{ConnectPort} = delete $mic_arg->{Port}; - $socks{Socket} = IO::Socket::Socks->new(%opt) or die + $opt{ConnectAddr} = delete $mic_arg{Server}; + $opt{ConnectPort} = delete $mic_arg{Port}; + $mic_arg{Socket} = IO::Socket::Socks->new(%opt) or die "E: <$$uri> ".eval('$IO::Socket::Socks::SOCKS_ERROR'); } - PublicInbox::IMAPClient->new(%$mic_arg, %socks, Keepalive => 1); + PublicInbox::IMAPClient->new(%mic_arg, Keepalive => 1); } sub auth_anon_cb { '' }; # for Mail::IMAPClient::Authcallback -- 2.44.0