]> Sergey Matveev's repositories - public-inbox.git/blobdiff - lib/PublicInbox/Feed.pm
use raw header for Message-ID
[public-inbox.git] / lib / PublicInbox / Feed.pm
index 150bea038241b57addb71cd34866d71cac3f7c7f..65375fad679ed542852f1c53e9a3a686e6c1e963 100644 (file)
@@ -55,7 +55,8 @@ sub atom_header {
        qq(<?xml version="1.0" encoding="us-ascii"?>\n) .
        qq{<feed\nxmlns="http://www.w3.org/2005/Atom">} .
        qq{$title} .
-       qq(<link\nhref="$feed_opts->{url}"/>) .
+       qq(<link\nrel="alternate"\ntype="text/html") .
+               qq(\nhref="$feed_opts->{url}"/>) .
        qq(<link\nrel="self"\nhref="$feed_opts->{atomurl}"/>) .
        qq(<id>mailto:$feed_opts->{id_addr}</id>);
 }
@@ -120,26 +121,25 @@ sub emit_html_index {
 
        my $title = $feed_opts->{description} || '';
        $title = PublicInbox::Hval->new_oneline($title)->as_html;
-       my $atom_url = $feed_opts->{atomurl};
        my ($footer, $param, $last);
        my $state = { ctx => $ctx, seen => {}, anchor_idx => 0 };
        my $srch = $ctx->{srch};
 
-       my $top = "<b>$title</b> (<a\nhref=\"$atom_url\">Atom feed</a>)";
+       my $top = "<b>$title</b> (<a\nhref=\"new.atom\">Atom feed</a>)";
 
        if ($srch) {
-               $top = qq{<form\naction=""><tt>$top} .
+               $top = qq{<form\naction=""><pre>$top} .
                          qq{ <input\nname=q\ntype=text />} .
                          qq{<input\ntype=submit\nvalue=search />} .
-                         qq{</tt></form>} .
-                         PublicInbox::Hval::PRE;
+                         q{</pre></form><pre>}
        } else {
-               $top = PublicInbox::Hval::PRE . $top . "\n";
+               $top = '<pre>' . $top . "\n";
        }
 
        $fh->write("<html><head><title>$title</title>" .
                   "<link\nrel=alternate\ntitle=\"Atom feed\"\n".
-                  "href=\"$atom_url\"\ntype=\"application/atom+xml\"/>" .
+                  "href=\"new.atom\"\ntype=\"application/atom+xml\"/>" .
+                  PublicInbox::Hval::STYLE .
                   "</head><body>$top");
 
        # if the 'r' query parameter is given, it is a legacy permalink
@@ -194,7 +194,7 @@ sub nav_footer {
                $head = $cgi->path_info;
                $head = qq!<a\nhref="$head">head</a>!;
        }
-       my $atom = "<a\nhref=\"$feed_opts->{atomurl}\">Atom</a>";
+       my $atom = "<a\nhref=\"$feed_opts->{atomurl}\">Atom feed</a>";
        "<a\nname=\"s$anchor\">page:</a> $next $head $atom";
 }
 
@@ -255,7 +255,6 @@ sub each_recent_blob {
                }
        }
 
-       close $log; # we may EPIPE here
        # for pagination
        ($first_commit, $last_commit);
 }
@@ -269,7 +268,6 @@ sub get_feedopts {
        my %rv;
        if (open my $fh, '<', "$ctx->{git_dir}/description") {
                chomp($rv{description} = <$fh>);
-               close $fh;
        } else {
                $rv{description} = '($GIT_DIR/description missing)';
        }
@@ -284,14 +282,7 @@ sub get_feedopts {
 
        my $url_base;
        if ($cgi) {
-               my $base;
-               if (ref($cgi) eq 'CGI') {
-                       $base = $cgi->url(-base);
-               } else {
-                       $base = $cgi->base->as_string;
-                       $base =~ s!/\z!!;
-               }
-               $url_base = "$base/$listname";
+               $url_base = $cgi->base->as_string . $listname;
                if (my $mid = $ctx->{mid}) { # per-thread feed:
                        $rv{atomurl} = "$url_base/$mid/t.atom";
                } else {
@@ -329,7 +320,7 @@ sub add_to_feed {
        my $midurl = $feed_opts->{midurl};
 
        my $header_obj = $mime->header_obj;
-       my $mid = $header_obj->header('Message-ID');
+       my $mid = $header_obj->header_raw('Message-ID');
        defined $mid or return 0;
        $mid = PublicInbox::Hval->new_msgid($mid);
        my $href = $mid->as_href;