lib/PublicInbox/Watch.pm | 21 ++++++++++++++-------

diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm
index 0bb92d0a9055703233b7af5cafe53bdfa0232e2f..2698c44ab34b8cebaec2e321f75a560b53b1afe2 100644
--- a/lib/PublicInbox/Watch.pm
+++ b/lib/PublicInbox/Watch.pm
@@ -589,6 +589,7 @@
 sub watch_atfork_parent ($) {
 	my ($self) = @_;
 	_done_for_now($self);
+	PublicInbox::Sigfd::block_signals();
 }
 
 sub imap_idle_requeue ($) { # DS::add_timer callback
@@ -628,10 +629,14 @@ 	my ($self) = @_;
 	return if $self->{quit};
 	my $idle_todo = $self->{idle_todo};
 	if ($idle_todo && @$idle_todo) {
-		watch_atfork_parent($self);
-		while (my $url_intvl = shift(@$idle_todo)) {
-			imap_idle_fork($self, $url_intvl);
-		}
+		my $oldset = watch_atfork_parent($self);
+		eval {
+			while (my $url_intvl = shift(@$idle_todo)) {
+				imap_idle_fork($self, $url_intvl);
+			}
+		};
+		PublicInbox::Sigfd::sig_setmask($oldset);
+		die $@ if $@;
 	}
 	goto(&fs_scan_step) if $self->{mdre};
 }
@@ -684,9 +689,9 @@
 sub poll_fetch_fork ($) { # DS::add_timer callback
 	my ($self, $intvl, $urls) = @{$_[0]};
 	return if $self->{quit};
-	watch_atfork_parent($self);
-	defined(my $pid = fork) or die "fork: $!";
-	if ($pid == 0) {
+	my $oldset = watch_atfork_parent($self);
+	my $pid = fork;
+	if (defined($pid) && $pid == 0) {
 		watch_atfork_child($self);
 		if ($urls->[0] =~ m!\Aimaps?://!i) {
 			watch_imap_fetch_all($self, $urls);
@@ -695,6 +700,8 @@ 			watch_nntp_fetch_all($self, $urls);
 		}
 		_exit(0);
 	}
+	PublicInbox::Sigfd::sig_setmask($oldset);
+	die "fork: $!"  unless defined $pid;
 	$self->{poll_pids}->{$pid} = [ $intvl, $urls ];
 	PublicInbox::DS::dwaitpid($pid, \&poll_fetch_reap, $self);
 }