From: Eric Wong <e@80x24.org>
Date: Tue, 15 Apr 2014 06:35:52 +0000 (+0000)
Subject: HTML: use shorter URLs in indices
X-Git-Tag: v1.0.0~1250
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=165b8046310d5696a1877b267f5eb74b5a431466;p=thirdparty%2Fpublic-inbox.git

HTML: use shorter URLs in indices

Long URLs are not needed for HTML pages, but may be for feeds since
they're often resyndicated and not consumed by the browser.
---

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index b08bd8837..92bbf92d6 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -118,13 +118,15 @@ sub get_feedopts {
 	}
 	my $url_base;
 	if ($cgi) {
-		my $cgi_url = $cgi->self_url;
+		my $cgi_url = $cgi->url(-path=>1, -query=>1, -relative=>1);
+		my $base = $cgi->url(-base);
 		$url_base = $cgi_url;
 		if ($url_base =~ s!/(?:|index\.html)?\z!!) {
-			$rv{atomurl} = "$url_base/index.atom.xml";
+			$rv{atomurl} = "$base$url_base/index.atom.xml";
 		} else {
 			$url_base =~ s!/?(?:index|all)\.atom\.xml\z!!;
-			$rv{atomurl} = $cgi_url;
+			$rv{atomurl} = $base . $cgi_url;
+			$url_base = $base . $url_base; # XXX is this needed?
 		}
 	} else {
 		$url_base = "http://example.com";