From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 18 May 2016 11:27:03 +0000 (+0300)
Subject: lib-imap-storage: Don't double-filter HEADER.FIELDS (..) headers.
X-Git-Tag: 2.3.0.rc1~3700
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=333602c40;p=thirdparty%2Fdovecot%2Fcore.git

lib-imap-storage: Don't double-filter HEADER.FIELDS (..) headers.
---

diff --git a/src/lib-imap-storage/imap-msgpart.c b/src/lib-imap-storage/imap-msgpart.c
index d109793e81..82fc35f6f8 100644
--- a/src/lib-imap-storage/imap-msgpart.c
+++ b/src/lib-imap-storage/imap-msgpart.c
@@ -377,12 +377,10 @@ imap_msgpart_get_partial_header(struct mail *mail, struct istream *mail_input,
 	bool has_nuls;
 
 	if (msgpart->fetch_type == FETCH_HEADER_FIELDS) {
-		input = i_stream_create_header_filter(mail_input,
-						      HEADER_FILTER_INCLUDE |
-						      HEADER_FILTER_HIDE_BODY,
-						      hdr_fields, hdr_count,
-						      *null_header_filter_callback,
-						      (void *)NULL);
+		/* mail_get_header_stream() already filtered out the
+		   unwanted headers. */
+		input = mail_input;
+		i_stream_ref(input);
 	} else {
 		i_assert(msgpart->fetch_type == FETCH_HEADER_FIELDS_NOT);
 		input = i_stream_create_header_filter(mail_input,