unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
* [PATCH] mbox: do not clobber existing archive headers in WWW
@ 2016-04-12 21:25 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2016-04-12 21:25 UTC (permalink / raw)
  To: meta

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', "<mailto:$feed_opts->{id_addr}>");
+	my %append = (
+		'Archived-At' => "<$base$mid/>",
+		'List-Archive' => "<$base>",
+		'List-Post' => "<mailto:$feed_opts->{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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-04-12 21:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-12 21:25 [PATCH] mbox: do not clobber existing archive headers in WWW Eric Wong

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).