user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
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	[thread overview]
Message-ID: <20160412212505.2337-1-e@80x24.org> (raw)

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


                 reply	other threads:[~2016-04-12 21:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160412212505.2337-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

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).