3 files changed, 3 insertions, 5 deletions
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 3cddfd18..7a4dfed0 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -25,7 +25,6 @@ use v5.10.1;
  use parent qw(Exporter);
  use bytes;
  use POSIX qw(WNOHANG sigprocmask SIG_SETMASK);
-use IO::Handle qw();
  use Fcntl qw(SEEK_SET :DEFAULT O_APPEND);
  use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
  use Scalar::Util qw(blessed);
@@ -135,7 +134,7 @@ sub add_timer ($$;@) {
  sub set_cloexec ($) {
      my ($fd) = @_;
  
-    $_io = IO::Handle->new_from_fd($fd, 'r+') or return;
+    open($_io, '+<&=', $fd) or return;
      defined(my $fl = fcntl($_io, F_GETFD, 0)) or return;
      fcntl($_io, F_SETFD, $fl | FD_CLOEXEC);
  }
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index b5f97d81..727311a4 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -367,7 +367,7 @@ sub inherit ($) {
          my $end = $fds + 2; # LISTEN_FDS_START - 1
          my @rv = ();
          foreach my $fd (3..$end) {
-                my $s = IO::Handle->new_from_fd($fd, 'r');
+                open(my $s, '<&=', $fd) or warn "fdopen fd=$fd: $!";
                  if (my $k = sockname($s)) {
                          my $prev_was_blocking = $s->blocking(0);
                          warn <<"" if $prev_was_blocking;
diff --git a/lib/PublicInbox/Sigfd.pm b/lib/PublicInbox/Sigfd.pm
index a4d1b3bb..d91ea0e7 100644
--- a/lib/PublicInbox/Sigfd.pm
+++ b/lib/PublicInbox/Sigfd.pm
@@ -8,7 +8,6 @@ use strict;
  use parent qw(PublicInbox::DS);
  use PublicInbox::Syscall qw(signalfd EPOLLIN EPOLLET SFD_NONBLOCK);
  use POSIX ();
-use IO::Handle ();
  
  # returns a coderef to unblock signals if neither signalfd or kqueue
  # are available.
@@ -27,7 +26,7 @@ sub new {
          my $io;
          my $fd = signalfd(-1, [keys %signo], $flags);
          if (defined $fd && $fd >= 0) {
-                $io = IO::Handle->new_from_fd($fd, 'r+');
+                open($io, '+<&=', $fd) or die "open: $!";
          } elsif (eval { require PublicInbox::DSKQXS }) {
                  $io = PublicInbox::DSKQXS->signalfd([keys %signo], $flags);
          } else {