inbox: base_url method takes PSGI env hashref instead

This is lighter and we can work further towards eliminating
our Plack::Request dependency entirely.

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index ada713c7..96c92652 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -71,10 +71,14 @@ sub cloneurl {
 }
 
 sub base_url {
-        my ($self, $prq) = @_; # Plack::Request
-        if (defined $prq) {
-                my $url = $prq->base->as_string;
-                $url .= '/' if $url !~ m!/\z!; # for mount in Plack::Builder
+        my ($self, $env) = @_;
+        if ($env) { # PSGI env
+                my $scheme = $env->{'psgi.url_scheme'};
+                my $host_port = $env->{HTTP_HOST} ||
+                        "$env->{SERVER_NAME}:$env->{SERVER_PORT}";
+                my $url = "$scheme://$host_port". ($env->{SCRIPT_NAME} || '/');
+                # for mount in Plack::Builder
+                $url .= '/' if $url !~ m!/\z!;
                 $url .= $self->{name} . '/';
         } else {
                 # either called from a non-PSGI environment (e.g. NNTP/POP3)