httpd/async: retry reads properly when parsing headers

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

diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm
index 75b3bd50e9a0ddeecee96fdf862d21ce92c00528..7bbab1e1cd65c22d2a895f5a99b5924fa172afd5 100644 (file)
--- a/lib/PublicInbox/HTTPD/Async.pm
+++ b/lib/PublicInbox/HTTPD/Async.pm
@@ -14,7 +14,7 @@
 # arg: arg for {cb}
 # end_obj: CODE or object which responds to ->event_step when ->close is called
 package PublicInbox::HTTPD::Async;
-use strict;
+use v5.12;
 use parent qw(PublicInbox::DS);
 use Errno qw(EAGAIN);
 use PublicInbox::Syscall qw(EPOLLIN);
@@ -37,16 +37,16 @@ sub new {
                arg => $arg, # arg for $cb
                end_obj => $end_obj, # like END{}, can ->event_step
        }, $class;
-       my $pp = tied *$io;
+       my $pp = tied *$io; # ProcessPipe
        $pp->{fh}->blocking(0) // die "$io->blocking(0): $!";
        $self->SUPER::new($io, EPOLLIN);
 }
 
 sub event_step {
        my ($self) = @_;
-       if (my $cb = delete $self->{cb}) {
+       if (defined $self->{cb}) {
                # this may call async_pass when headers are done
-               $cb->(my $refcnt_guard = delete $self->{arg});
+               $self->{cb}->($self->{arg});
        } elsif (my $sock = $self->{sock}) {
                # $http may be undef if discarding body output from cgit on 404
                my $http = $self->{http} or return $self->close;
@@ -54,7 +54,7 @@ sub event_step {
                # 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
+                       $self->{ofh}->write($buf); # may call $http->close
                        # let other clients get some work done, too
                        return if $http->{sock}; # !closed
 
@@ -63,7 +63,7 @@ sub event_step {
                        return; # EPOLLIN means we'll be notified
                }
 
-               # Done! Error handling will happen in $self->{fh}->close
+               # Done! Error handling will happen in $self->{ofh}->close
                # called by end_obj->event_step handler
                delete $http->{forward};
                $self->close; # queues end_obj->event_step to be called
@@ -71,9 +71,12 @@ sub event_step {
 }
 
 # once this is called, all data we read is passed to the
-# to the PublicInbox::HTTP instance ($http) via $fh->write
+# to the PublicInbox::HTTP instance ($http) via $ofh->write
+# $ofh is typically PublicInbox::HTTP::{Chunked,Identity}, but
+# may be PublicInbox::GzipFilter or $PublicInbox::Qspawn::qx_fh
 sub async_pass {
-       my ($self, $http, $fh, $bref) = @_;
+       my ($self, $http, $ofh, $bref) = @_;
+       delete @$self{qw(cb arg)};
        # In case the client HTTP connection ($http) dies, it
        # will automatically close this ($self) object.
        $http->{forward} = $self;
@@ -82,16 +85,17 @@ sub async_pass {
        # 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);
+       $ofh->write($$bref);
 
        $self->{http} = $http;
-       $self->{fh} = $fh;
+       $self->{ofh} = $ofh;
 }
 
 # may be called as $forward->close in PublicInbox::HTTP or EOF (event_step)
 sub close {
        my $self = $_[0];
        $self->SUPER::close; # DS::close
+       delete @$self{qw(cb arg)};
 
        # we defer this to the next timer loop since close is deferred
        if (my $end_obj = delete $self->{end_obj}) {