From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: Re: [PATCH 2/2] config: support multi-value inbox.*.*url
Date: Thu, 2 Jan 2020 20:56:17 +0000 [thread overview]
Message-ID: <20200102205617.GA28600@dcvr> (raw)
In-Reply-To: <20200102030930.20994-3-e@80x24.org>
Eric Wong <e@80x24.org> wrote:
> +++ b/lib/PublicInbox/Hval.pm
> @@ -86,6 +86,13 @@ sub raw {
>
> sub prurl {
> my ($env, $u) = @_;
> + if (ref($u) eq 'ARRAY') {
> + my $h = $env->{HTTP_HOST} // $env->{SERVER_NAME};
> + if (my @host_match = grep(/\b\Q$h\E\b/, @$u)) {
> + return prurl($env, $host_match[0]);
> + }
> + $u = $u->[0]; # fall through to below:
> + }
> index($u, '//') == 0 ? "$env->{'psgi.url_scheme'}:$u" : $u;
> }
No need for recursion, actually :x
diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index 0a0de834..cd3a4df3 100644
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -88,10 +88,9 @@ sub prurl {
my ($env, $u) = @_;
if (ref($u) eq 'ARRAY') {
my $h = $env->{HTTP_HOST} // $env->{SERVER_NAME};
- if (my @host_match = grep(/\b\Q$h\E\b/, @$u)) {
- return prurl($env, $host_match[0]);
- }
- $u = $u->[0]; # fall through to below:
+ my @host_match = grep(/\b\Q$h\E\b/, @$u);
+ $u = $host_match[0] // $u->[0];
+ # fall through to below:
}
index($u, '//') == 0 ? "$env->{'psgi.url_scheme'}:$u" : $u;
}
prev parent reply other threads:[~2020-01-02 20:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-02 3:09 [PATCH 0/2] support multiple "url" and "infourl" values Eric Wong
2020-01-02 3:09 ` [PATCH 1/2] wwwlisting: show configured "infourl" properly Eric Wong
2020-01-02 3:09 ` [PATCH 2/2] config: support multi-value inbox.*.*url Eric Wong
2020-01-02 20:56 ` Eric Wong [this message]
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=20200102205617.GA28600@dcvr \
--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).