dovecot-2.2-pigeonhole: lib-sieve: Forgot to enable header unfol...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/70a1773bd1cf
changeset: 2188:70a1773bd1cf
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Sat Jan 02 17:13:00 2016 +0100
description:
lib-sieve: Forgot to enable header unfolding for (mime) headers parsed from the whole message.

diffstat:

 src/lib-sieve/sieve-message.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 224a8335ad20 -r 70a1773bd1cf src/lib-sieve/sieve-message.c
--- a/src/lib-sieve/sieve-message.c	Sat Jan 02 16:14:27 2016 +0100
+++ b/src/lib-sieve/sieve-message.c	Sat Jan 02 17:13:00 2016 +0100
@@ -1078,6 +1078,7 @@
 	struct mail *mail = sieve_message_get_mail(renv->msgctx);
 	enum message_parser_flags mparser_flags =
 		MESSAGE_PARSER_FLAG_INCLUDE_MULTIPART_BLOCKS;
+	enum message_header_parser_flags hparser_flags = 0;
 	ARRAY(struct sieve_message_header) headers;
 	struct sieve_message_part *body_part, *header_part, *last_part;
 	struct message_parser_ctx *parser;
@@ -1114,6 +1115,7 @@
 	if (iter_all) {
 		t_array_init(&headers, 64);
 		hdr_content = t_str_new(512);
+		hparser_flags |= MESSAGE_HEADER_PARSER_FLAG_CLEAN_ONELINE;
 	} else {
 		memset(&headers, 0, sizeof(headers));
 	}
@@ -1122,10 +1124,10 @@
 	decoder = message_decoder_init(NULL, 0);
 
 	// FIXME: currently not tested with edit-mail.
-		//parser = message_parser_init_from_parts(parts, input, 0,
-		//mparser_flags);
-	parser = message_parser_init
-		(pool_datastack_create(), input, 0, mparser_flags);
+		//parser = message_parser_init_from_parts(parts, input,
+		// hparser_flags, mparser_flags);
+	parser = message_parser_init(pool_datastack_create(),
+		input, hparser_flags, mparser_flags);
 	while ( (ret=message_parser_parse_next_block
 		(parser, &block)) > 0 ) {
 		struct sieve_message_part **body_part_idx;