qspawn: more generic command chaining

[public-inbox.git] / lib / PublicInbox / GitHTTPBackend.pm

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 1eb51f2704e1f2f06414d7f8db78b9c08ef743fc..e84d4ff802bf763697ee9937257ec84fc6b83c0f 100644 (file)
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -128,7 +128,7 @@ sub input_prepare {
        { 0 => $in };
 }
 
-sub parse_cgi_headers {
+sub parse_cgi_headers { # {parse_hdr} for Qspawn
        my ($r, $bref, $ctx) = @_;
        return r(500) unless defined $r && $r >= 0;
        $$bref =~ s/\A(.*?)\r?\n\r?\n//s or return $r == 0 ? r(500) : undef;
@@ -145,19 +145,18 @@ sub parse_cgi_headers {
        }
 
        # fallback to WwwCoderepo if cgit 404s.  Duplicating $ctx prevents
-       # ->finalize from the current Qspawn from using qspawn.wcb
+       # ->finalize from the current Qspawn from using qspawn.wcb.
+       # This makes qspawn skip ->async_pass and causes
+       # PublicInbox::HTTPD::Async::event_step to close shortly after
        if ($code == 404 && $ctx->{www} && !$ctx->{_coderepo_tried}++) {
                my %ctx = %$ctx;
                $ctx{env} = +{ %{$ctx->{env}} };
                delete $ctx->{env}->{'qspawn.wcb'};
                $ctx->{env}->{'plack.skip-deflater'} = 1; # prevent 2x gzip
                my $res = $ctx->{www}->coderepo->srv(\%ctx);
-               if (ref($res) eq 'CODE') {
-                       $res->(delete $ctx{env}->{'qspawn.wcb'});
-               } else { # ref($res) eq 'ARRAY'
-                       $ctx->{env}->{'qspawn.wcb'} = $ctx{env}->{'qspawn.wcb'};
-               }
-               $res; # non ARRAY ref for ->psgi_return_init_cb
+               # for ->psgi_return_init_cb:
+               $ctx->{env}->{'qspawn.wcb'} = $ctx{env}->{'qspawn.wcb'};
+               $res; # CODE or ARRAY ref
        } else {
                [ $code, \@h ]
        }