From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] www: fix missing cgit fallback after legacy redirects
Date: Tue, 2 Apr 2019 02:44:25 +0000 [thread overview]
Message-ID: <20190402024425.27015-1-e@80x24.org> (raw)
We need to instate our cgit handler everywhere we use NewsWWW
to catch wildcard requests which our normal endpoints do not
handle.
---
lib/PublicInbox/WWW.pm | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 6e14e8c..798e8b1 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -175,11 +175,18 @@ sub r404 {
# simple response for errors
sub r { [ $_[0], ['Content-Type' => 'text/plain'], [ join(' ', @_, "\n") ] ] }
+sub news_cgit_fallback ($) {
+ my ($ctx) = @_;
+ my $www = $ctx->{www};
+ my $env = $ctx->{env};
+ my $res = $www->news_www->call($env);
+ $res->[0] == 404 ? $www->cgit->call($env) : $res;
+}
+
# returns undef if valid, array ref response if invalid
sub invalid_inbox ($$) {
my ($ctx, $inbox) = @_;
- my $www = $ctx->{www};
- my $obj = $www->{pi_config}->lookup_name($inbox);
+ my $obj = $ctx->{www}->{pi_config}->lookup_name($inbox);
if (defined $obj) {
$ctx->{git} = $obj->git;
$ctx->{-inbox} = $obj;
@@ -190,9 +197,7 @@ sub invalid_inbox ($$) {
# generation and link things intended for nntp:// to https?://,
# so try to infer links and redirect them to the appropriate
# list URL.
- my $env = $ctx->{env};
- my $res = $www->news_www->call($env);
- $res->[0] == 404 ? $www->cgit->call($env) : $res;
+ news_cgit_fallback($ctx);
}
# returns undef if valid, array ref response if invalid
@@ -392,7 +397,7 @@ sub legacy_redirects {
} elsif ($path_info =~ m!$INBOX_RE/(\S+/\S+)/f\z!o) {
r301($ctx, $1, $2);
} else {
- $ctx->{www}->news_www->call($ctx->{env});
+ news_cgit_fallback($ctx);
}
}
--
EW
reply other threads:[~2019-04-02 2:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20190402024425.27015-1-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.
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).