diff options
| author | Eric Wong <e@80x24.org> | 2021-09-22 02:24:30 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-09-22 05:21:19 +0000 |
| commit | 28d5a8d647e3ab56cc5570af0d6f3ccf75dc91f2 (patch) | |
| tree | abc69aaba694c69febf53ef1965763464035e6bf /lib/PublicInbox/Watch.pm | |
| parent | 30cc504b0e88302588ca26e91b8005ec62d5d6f2 (diff) | |
| download | public-inbox-28d5a8d647e3ab56cc5570af0d6f3ccf75dc91f2.tar.gz | |
This fixes the occasional t/lei-sigpipe.t infinite loop
under "make check-run".
Link: http://nntp.perl.org/group/perl.perl5.porters/258784
<CAHhgV8hPbcmkzWizp6Vijw921M5BOXixj4+zTh3nRS9vRBYk8w@mail.gmail.com>
Followup-to: b552bb9150775fe4 ("daemon+watch: fix localization of %SIG for non-signalfd users")
Diffstat (limited to 'lib/PublicInbox/Watch.pm')
| -rw-r--r-- | lib/PublicInbox/Watch.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm index 387eb6d2..0523ad03 100644 --- a/lib/PublicInbox/Watch.pm +++ b/lib/PublicInbox/Watch.pm @@ -384,7 +384,9 @@ sub watch_atfork_child ($) { delete $self->{poll_pids}; delete $self->{opendirs}; PublicInbox::DS->Reset; - %SIG = (%SIG, %{$self->{sig}}, CHLD => 'DEFAULT'); + my $sig = delete $self->{sig}; + $sig->{CHLD} = 'DEFAULT'; + @SIG{keys %$sig} = values %$sig; PublicInbox::DS::sig_setmask($self->{oldset}); } |