user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/3] www: do not call ->coderepo->srv on sub ref
Date: Wed,  5 Oct 2022 22:29:39 +0000	[thread overview]
Message-ID: <20221005222941.4098-2-e@80x24.org> (raw)
In-Reply-To: <20221005222941.4098-1-e@80x24.org>

The PublicInbox::Cgit wrapper will return a sub-ref for most
responses, so ensure we don't try to treat it as an array-ref.
---
 lib/PublicInbox/WWW.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index d0e20fb5..470510ae 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -197,8 +197,9 @@ sub news_cgit_fallback ($) {
 	my $www = $ctx->{www};
 	my $env = $ctx->{env};
 	my $res = $www->news_www->call($env);
-	$res = $www->cgit->call($env) if $res->[0] == 404;
-	$res = $www->coderepo->srv($ctx) if $res->[0] == 404;
+	$res = $www->cgit->call($env, $ctx) if $res->[0] == 404;
+	ref($res) eq 'ARRAY' && $res->[0] == 404 and
+		$res = $www->coderepo->srv($ctx);
 	$res;
 }
 

  reply	other threads:[~2022-10-05 22:29 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-05 22:29 [PATCH 0/3] www: configurable cgit fallback for coderepos Eric Wong
2022-10-05 22:29 ` Eric Wong [this message]
2022-10-05 22:29 ` [PATCH 2/3] www: cgit: fall back to WwwCoderepo on 404s Eric Wong
2022-10-05 22:29 ` [PATCH 3/3] www: support publicinbox.cgit knob Eric Wong
2022-10-07  7:42   ` [squash 4/3] manpage fix (was: [PATCH 3/3] www: support publicinbox.cgit knob) 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=20221005222941.4098-2-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).