my ($self, $err) = @_; # $err: $!
warn "psgi_{return,qx} $err" if defined($err);
finish($self);
- my ($fh, $qx_fh) = delete(@$self{qw(fh qx_fh)});
+ my ($fh, $qx_fh) = delete(@$self{qw(qfh qx_fh)});
$fh->close if $fh; # async-only (psgi_return)
}
if (ref($r) ne 'ARRAY' || scalar(@$r) == 3) { # error
if ($async) { # calls rpipe->close && ->event_step
$async->close; # PublicInbox::HTTPD::Async::close
- } else {
- $self->{rpipe}->close;
+ } else { # generic PSGI:
+ delete($self->{rpipe})->close;
event_step($self);
+ waitpid_err($self);
+ }
+ if (ref($r) eq 'ARRAY') { # error
+ $wcb->($r)
+ } elsif (ref($r) eq 'CODE') { # chain another command
+ $r->($wcb)
}
- $wcb->($r) if ref($r) eq 'ARRAY';
+ # else do nothing
} elsif ($async) {
# done reading headers, handoff to read body
my $fh = $wcb->($r); # scalar @$r == 2
$fh = $filter->attach($fh) if $filter;
- $self->{fh} = $fh;
+ $self->{qfh} = $fh;
$async->async_pass($env->{'psgix.io'}, $fh,
delete($self->{hdr_buf}));
} else { # for synchronous PSGI servers
require PublicInbox::GetlineBody;
+ my $buf = delete $self->{hdr_buf};
$r->[2] = PublicInbox::GetlineBody->new($self->{rpipe},
- \&event_step, $self,
- ${$self->{hdr_buf}}, $filter);
+ \&event_step, $self, $$buf, $filter);
$wcb->($r);
}
}