diff options
| -rw-r--r-- | lib/PublicInbox/Feed.pm | 5 | ||||
| -rwxr-xr-x | public-inbox.cgi | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 92bbf92d..1c205631 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -121,8 +121,9 @@ sub get_feedopts { 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} = "$base$url_base/index.atom.xml"; + if ($url_base =~ s!/(?:|(index|all)\.html)?\z!!) { + my $ia = $1 || 'index'; + $rv{atomurl} = "$base$url_base/$ia.atom.xml"; } else { $url_base =~ s!/?(?:index|all)\.atom\.xml\z!!; $rv{atomurl} = $base . $cgi_url; diff --git a/public-inbox.cgi b/public-inbox.cgi index 17eb5b7b..374b03d4 100755 --- a/public-inbox.cgi +++ b/public-inbox.cgi @@ -64,6 +64,8 @@ sub main { r404(); } elsif ($path_info =~ m!$LISTNAME_RE/(?:index\.html)?\z!o) { invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 1); + } elsif ($path_info =~ m!$LISTNAME_RE/(?:all\.html)?\z!o) { + invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 0); } elsif ($path_info =~ m!$LISTNAME_RE/index\.atom\.xml\z!o) { invalid_list(\%ctx, $1) || get_atom(\%ctx, $cgi, 1); } elsif ($path_info =~ m!$LISTNAME_RE/all\.atom\.xml\z!o) { |