From d377a9d2f972f85edf759a6c152ca49078baba38 Mon Sep 17 00:00:00 2001 From: "Eric Wong (Contractor, The Linux Foundation)" Date: Mon, 10 Jun 2019 18:09:27 +0000 Subject: edit: drop unwanted headers before noop check mutt will set Content-Length, Lines, and Status headers unconditionally, so we need to account for that before doing header comparisons to avoid making expensive changes when noop edits are made. --- script/public-inbox-edit | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'script/public-inbox-edit') diff --git a/script/public-inbox-edit b/script/public-inbox-edit index 7a534cc2..16d78529 100755 --- a/script/public-inbox-edit +++ b/script/public-inbox-edit @@ -14,6 +14,7 @@ use PublicInbox::MID qw(mid_clean mids); PublicInbox::Admin::check_require('-index'); require PublicInbox::MIME; require PublicInbox::InboxWritable; +require PublicInbox::Import; my $usage = "$0 -m MESSAGE_ID [--all] [INBOX_DIRS]"; my $opt = { verbose => 1, all => 0, -min_inbox_version => 2, raw => 0 }; @@ -197,6 +198,11 @@ W: possible message boundary splitting error my $new_mime = PublicInbox::MIME->new(\$new_raw); my $old_mime = PublicInbox::MIME->new($old_raw); + # make sure we don't compare unwanted headers, since mutt adds + # Content-Length, Status, and Lines headers: + PublicInbox::Import::drop_unwanted_headers($new_mime); + PublicInbox::Import::drop_unwanted_headers($old_mime); + # allow changing Received: and maybe other headers which can # contain sensitive info. my $nhdr = $new_mime->header_obj; -- cgit v1.2.3-24-ge0c7