From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00
	shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 9329C1F463;
	Thu,  2 Jan 2020 20:56:18 +0000 (UTC)
Date: Thu, 2 Jan 2020 20:56:17 +0000
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: Re: [PATCH 2/2] config: support multi-value inbox.*.*url
Message-ID: <20200102205617.GA28600@dcvr>
References: <20200102030930.20994-1-e@80x24.org>
 <20200102030930.20994-3-e@80x24.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20200102030930.20994-3-e@80x24.org>
List-Id: <meta.public-inbox.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;
 }