X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2FPublicInbox%2FExtMsg.pm;h=cf9b6d58ba8d3b9836300a28cf96cf2000c1fa8f;hb=8968889e3ebfa09dd2c80fe8b917b83ac13ff356;hp=d89a7e3097b50489f0e92a5df3d8eb8e7c618f86;hpb=62a77b55c9fadec1b4b1ba061e99f4a18d8a14bc;p=public-inbox.git

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index d89a7e30..cf9b6d58 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -86,15 +86,7 @@ sub ext_msg {
 	eval { require PublicInbox::Msgmap };
 	my $have_mm = $@ ? 0 : 1;
 	my $cgi = $ctx->{cgi};
-	my $base_url;
-	my $scheme;
-	if (ref($cgi) eq 'CGI') {
-		$base_url = $cgi->url(-base) . '/';
-		$scheme = $cgi->protocol;
-	} else { # Plack::Request
-		$base_url = $cgi->base->as_string;
-		$scheme = $cgi->env->{'psgi.url_scheme'};
-	}
+	my $base_url = $cgi->base->as_string;
 	if ($have_mm) {
 		my $tmp_mid = $mid;
 		my $url;
@@ -145,6 +137,7 @@ again:
 	if (@EXT_URL && index($mid, '@') >= 0) {
 		$code = 300;
 		$s .= "\nPerhaps try an external site:\n\n";
+		my $scheme = $cgi->scheme;
 		foreach my $u (@EXT_URL) {
 			$u = "$scheme:$u" if $u =~ m!\A//!;
 			my $r = sprintf($u, $href);