From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/5] www: cgit: fix fallback to WwwCoderepo on array responses
Date: Sat, 8 Oct 2022 08:24:47 +0000 [thread overview]
Message-ID: <20221008082448.9856-5-e@80x24.org> (raw)
In-Reply-To: <20221008082448.9856-1-e@80x24.org>
For fast PSGI responses which don't require returning a coderef,
just reuse qspawn.wcb directly on the arrayref to avoid an undef
$wcb from firing in psgi_return_init_cb.
I only noticed this because the ViewVCS search form is broken
for /$CODEREPO/$OID/s/ endpoints at the moment.
---
lib/PublicInbox/GitHTTPBackend.pm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 61a13560..3aae5454 100644
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -155,7 +155,11 @@ sub parse_cgi_headers {
delete $ctx->{env}->{'qspawn.wcb'};
$ctx->{env}->{'plack.skip-deflater'} = 1; # prevent 2x gzip
my $res = $ctx->{www}->coderepo->srv(\%ctx);
- $res->(delete $ctx{env}->{'qspawn.wcb'}) if ref($res) eq 'CODE';
+ 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
} else {
[ $code, \@h ]
next prev parent reply other threads:[~2022-10-08 8:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-08 8:24 [PATCH 0/5] www: some coderepo stuff Eric Wong
2022-10-08 8:24 ` [PATCH 1/5] config: remove {-cgitrc_unparsed} field Eric Wong
2022-10-08 8:24 ` [PATCH 2/5] www_coderepo: wire up snapshots from summary Eric Wong
2022-10-08 8:24 ` [PATCH 3/5] www_coderepo: update blurb on the goal/purpose of this Eric Wong
2022-10-08 8:24 ` Eric Wong [this message]
2022-10-08 8:24 ` [PATCH 5/5] www_coderepo: allow searching one extindex|inbox Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221008082448.9856-5-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).