X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FQspawn.pm;h=7984e35a80510ffdf09cbb7f5e325ecd9eb764a0;hb=a12cd80b5821cf5cb2c8672aad0fba94c451f728;hp=6e24538959517b00ec1179f87318a9d875ab3db8;hpb=1556c660030b7ebb4006f522026e638285e94f46;p=public-inbox.git

diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 6e245389..7984e35a 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -40,7 +40,7 @@ my $def_limiter;
 # $cmd_env is the environ for the child process (not PSGI env)
 # $opt can include redirects and perhaps other process spawning options
 # {qsp_err} is an optional error buffer callers may access themselves
-sub new ($$$;) {
+sub new {
 	my ($class, $cmd, $cmd_env, $opt) = @_;
 	bless { args => [ $cmd, $cmd_env, $opt ] }, $class;
 }
@@ -106,10 +106,12 @@ sub finalize ($$) {
 		return unless $@;
 		warn "E: $@"; # hope qspawn.wcb can handle it
 	}
+	return if $self->{passed}; # another command chained it
 	if (my $wcb = delete $env->{'qspawn.wcb'}) {
 		# have we started writing, yet?
+		my $code = delete $env->{'qspawn.fallback'} // 500;
 		require PublicInbox::WwwStatic;
-		$wcb->(PublicInbox::WwwStatic::r(500));
+		$wcb->(PublicInbox::WwwStatic::r($code));
 	}
 }
 
@@ -132,7 +134,7 @@ sub start ($$$) {
 	}
 }
 
-sub psgi_qx_init_cb {
+sub psgi_qx_init_cb { # this may be PublicInbox::HTTPD::Async {cb}
 	my ($self) = @_;
 	my $async = delete $self->{async}; # PublicInbox::HTTPD::Async
 	my ($r, $buf);
@@ -221,11 +223,16 @@ sub rd_hdr ($) {
 	$ret;
 }
 
-sub psgi_return_init_cb {
+sub psgi_return_init_cb { # this may be PublicInbox::HTTPD::Async {cb}
 	my ($self) = @_;
 	my $r = rd_hdr($self) or return;
 	my $env = $self->{psgi_env};
-	my $filter = delete($env->{'qspawn.filter'}) // (ref($r) eq 'ARRAY' ?
+	my $filter;
+	if (ref($r) eq 'ARRAY' && Scalar::Util::blessed($r->[2]) &&
+			$r->[2]->can('attach')) {
+		$filter = pop @$r;
+	}
+	$filter //= delete($env->{'qspawn.filter'}) // (ref($r) eq 'ARRAY' ?
 		PublicInbox::GzipFilter::qsp_maybe($r->[1], $env) : undef);
 
 	my $wcb = delete $env->{'qspawn.wcb'};
@@ -233,11 +240,18 @@ sub psgi_return_init_cb {
 	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);
+			$self->{passed} = 1;
 		}
-		$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