X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FGit.pm;h=96627daa19735106f31308be686d8c37961661b4;hb=44fbd4169f7434442dbf57851232edafa6fd0e46;hp=c7f82ba2f4eaba45a301a936ddd2d32b2722fa6c;hpb=7ea6eb5a69ae3e58d49eb1b04bd015d7eb38695f;p=public-inbox.git

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index c7f82ba2..96627daa 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -477,18 +477,19 @@ sub local_nick ($) {
 sub host_prefix_url ($$) {
 	my ($env, $url) = @_;
 	return $url if index($url, '//') >= 0;
-	my $scheme = $env->{'psgi.url_scheme'};
 	my $host_port = $env->{HTTP_HOST} //
 		"$env->{SERVER_NAME}:$env->{SERVER_PORT}";
-	"$scheme://$host_port". ($env->{SCRIPT_NAME} || '/') . $url;
+	my $sn = $env->{SCRIPT_NAME} // '';
+	"$env->{'psgi.url_scheme'}://$host_port$sn/$url";
 }
 
 sub base_url { # for coderepos, PSGI-only
 	my ($self, $env) = @_; # env - PSGI env
+	my $nick = $self->{nick} // return undef;
 	my $url = host_prefix_url($env, '');
 	# for mount in Plack::Builder
 	$url .= '/' if substr($url, -1, 1) ne '/';
-	$url . $self->{nick} . '/';
+	$url . $nick . '/';
 }
 
 sub isrch {} # TODO
@@ -496,9 +497,10 @@ sub isrch {} # TODO
 sub pub_urls {
 	my ($self, $env) = @_;
 	if (my $urls = $self->{cgit_url}) {
-		return map { host_prefix_url($env, $_) } @$urls;
+		map { host_prefix_url($env, $_) } @$urls;
+	} else {
+		(base_url($self, $env) // '???');
 	}
-	(local_nick($self) // '???');
 }
 
 sub cat_async_begin {