From 81a906c55b9510b38ea035dca13475fdd9d27083 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 6 Jan 2023 10:10:50 +0000 Subject: [PATCH] qspawn: use fallback response code from CGI program Prefer to use the original (cgit||git-http-backend) HTTP response code if our fallback to WwwCoderepo fails. 404 codes is typically more appropriate than 500 for these things. --- lib/PublicInbox/GitHTTPBackend.pm | 1 + lib/PublicInbox/Qspawn.pm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm index 5b879871..74432429 100644 --- a/lib/PublicInbox/GitHTTPBackend.pm +++ b/lib/PublicInbox/GitHTTPBackend.pm @@ -151,6 +151,7 @@ sub parse_cgi_headers { # {parse_hdr} for Qspawn if ($code == 404 && $ctx->{www} && !$ctx->{_coderepo_tried}++) { my $wcb = delete $ctx->{env}->{'qspawn.wcb'}; $ctx->{env}->{'plack.skip-deflater'} = 1; # prevent 2x gzip + $ctx->{env}->{'qspawn.fallback'} = $code; my $res = $ctx->{www}->coderepo->srv($ctx); # for ->psgi_return_init_cb $ctx->{env}->{'qspawn.wcb'} = $wcb; diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm index ab0ef25c..f8cbffcb 100644 --- a/lib/PublicInbox/Qspawn.pm +++ b/lib/PublicInbox/Qspawn.pm @@ -109,8 +109,9 @@ sub finalize ($$) { 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)); } } -- 2.44.0