httpd/async: remove useless undef

[public-inbox.git] / lib / PublicInbox / HTTPD / Async.pm

diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm
index bd1fd8faf2c1ea49569a702a16c75407ffd4220e..75b3bd50e9a0ddeecee96fdf862d21ce92c00528 100644 (file)
--- a/lib/PublicInbox/HTTPD/Async.pm
+++ b/lib/PublicInbox/HTTPD/Async.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # XXX This is a totally unstable API for public-inbox internal use only
@@ -17,7 +17,7 @@ package PublicInbox::HTTPD::Async;
 use strict;
 use parent qw(PublicInbox::DS);
 use Errno qw(EAGAIN);
-use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
+use PublicInbox::Syscall qw(EPOLLIN);
 
 # This is called via: $env->{'pi-httpd.async'}->()
 # $io is a read-only pipe ($rpipe) for now, but may be a
@@ -37,31 +37,30 @@ sub new {
                arg => $arg, # arg for $cb
                end_obj => $end_obj, # like END{}, can ->event_step
        }, $class;
-       IO::Handle::blocking($io, 0);
-       $self->SUPER::new($io, EPOLLIN | EPOLLET);
+       my $pp = tied *$io;
+       $pp->{fh}->blocking(0) // die "$io->blocking(0): $!";
+       $self->SUPER::new($io, EPOLLIN);
 }
 
 sub event_step {
        my ($self) = @_;
        if (my $cb = delete $self->{cb}) {
                # this may call async_pass when headers are done
-               $cb->(delete $self->{arg});
+               $cb->(my $refcnt_guard = delete $self->{arg});
        } elsif (my $sock = $self->{sock}) {
-               my $http = $self->{http};
+               # $http may be undef if discarding body output from cgit on 404
+               my $http = $self->{http} or return $self->close;
                # $self->{sock} is a read pipe for git-http-backend or cgit
                # and 65536 is the default Linux pipe size
                my $r = sysread($sock, my $buf, 65536);
                if ($r) {
                        $self->{fh}->write($buf); # may call $http->close
-                       if ($http->{sock}) { # !closed
-                               $self->requeue;
-                               # let other clients get some work done, too
-                               return;
-                       }
+                       # let other clients get some work done, too
+                       return if $http->{sock}; # !closed
 
                        # else: fall through to close below...
                } elsif (!defined $r && $! == EAGAIN) {
-                       return; # EPOLLET means we'll be notified
+                       return; # EPOLLIN means we'll be notified
                }
 
                # Done! Error handling will happen in $self->{fh}->close
@@ -79,18 +78,14 @@ sub async_pass {
        # will automatically close this ($self) object.
        $http->{forward} = $self;
 
-       # write anything we overread when we were reading headers
-       $fh->write($$bref); # PublicInbox:HTTP::{chunked,identity}_wcb
-
-       # we're done with this, free this memory up ASAP since the
-       # calls after this may use much memory:
-       $$bref = undef;
+       # write anything we overread when we were reading headers.
+       # This is typically PublicInbox:HTTP::{chunked,identity}_wcb,
+       # but may be PublicInbox::GzipFilter::write.  PSGI requires
+       # *_wcb methods respond to ->write (and ->close), not ->print
+       $fh->write($$bref);
 
        $self->{http} = $http;
        $self->{fh} = $fh;
-
-       # either hit EAGAIN or ->requeue to keep EPOLLET happy
-       event_step($self);
 }
 
 # may be called as $forward->close in PublicInbox::HTTP or EOF (event_step)