git: pub_urls shows base_url default

[public-inbox.git] / lib / PublicInbox / Git.pm

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 86b80a4edb877152f566c00a7b804952516e907b..96627daa19735106f31308be686d8c37961661b4 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -315,11 +315,10 @@ sub write_all {
                my $w = syswrite($out, $buf);
                if (defined $w) {
                        return if $w == length($buf);
-                       warn "chop: $w";
                        substr($buf, 0, $w, ''); # sv_chop
                } elsif ($! != EAGAIN) {
                        $self->fail("write: $!");
-               } else { warn "E: $!" }
+               }
                $read_step->($self, $inflight);
        } while (1);
 }
@@ -478,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
@@ -497,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 {