From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 3CB7D1F47D for ; Fri, 6 Jan 2023 10:11:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1672999861; bh=EoiDWncDKf54qw4X9CNmcIzQI/tszdH/TGoRikyYWs4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=rLg+Bj6+6679oklGua2BSs0MddSC9phrADuNVySxl522MG+5qIthrG5eFJG82fQ9t zzrzKOnLCd9dYQJ7d9QQRgVJ6rh26/SgtHNbRZWaclUBtBzW5Ded81ePel/SxOL+Kk aVbxACrNThI+wk2WbJzu5JGqq+3e4gMOVIvF5IWQ= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/4] qspawn: use fallback response code from CGI program Date: Fri, 6 Jan 2023 10:10:50 +0000 Message-Id: <20230106101053.1461700-2-e@80x24.org> In-Reply-To: <20230106101053.1461700-1-e@80x24.org> References: <20230106101053.1461700-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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)); } }