From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.8 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: meta@public-inbox.org Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 3E30020300 for ; Tue, 12 Apr 2016 21:25:04 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] mbox: do not clobber existing archive headers in WWW Date: Tue, 12 Apr 2016 21:25:05 +0000 Message-Id: <20160412212505.2337-1-e@80x24.org> List-Id: When serving archives, it's more robust to keep existing archive links in one server goes down. --- lib/PublicInbox/Mbox.pm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm index 9f20580..ffa6fa4 100644 --- a/lib/PublicInbox/Mbox.pm +++ b/lib/PublicInbox/Mbox.pm @@ -48,11 +48,21 @@ sub emit_msg { my $base = $feed_opts->{url}; my $mid = mid_clean($header_obj->header('Message-ID')); $mid = uri_escape_utf8($mid); - my @archived_at = $header_obj->header('Archived-At'); - push @archived_at, "<$base$mid/>"; - $header_obj->header_set('Archived-At', @archived_at); - $header_obj->header_set('List-Archive', "<$base>"); - $header_obj->header_set('List-Post', "{id_addr}>"); + my %append = ( + 'Archived-At' => "<$base$mid/>", + 'List-Archive' => "<$base>", + 'List-Post' => "{id_addr}>", + ); + while (my ($k, $v) = each %append) { + my @v = $header_obj->header($k); + foreach (@v) { + if ($v eq $_) { + $v = undef; + last; + } + } + $header_obj->header_set($k, @v, $v) if defined $v; + } my $buf = $header_obj->as_string; unless ($buf =~ /\AFrom /) { -- EW