From 30f6ac0eaf2be81072ee078ba5b232c368b89ff1 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Sun, 24 Jan 2016 19:54:51 +0200
Subject: [PATCH] pop3-migration: Fix to 2f19f8 - Don't convert LF also to '?'
 in header hashes.

---
 src/plugins/pop3-migration/pop3-migration-plugin.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/pop3-migration/pop3-migration-plugin.c b/src/plugins/pop3-migration/pop3-migration-plugin.c
index 055d17edc6..c29dec0f16 100644
--- a/src/plugins/pop3-migration/pop3-migration-plugin.c
+++ b/src/plugins/pop3-migration/pop3-migration-plugin.c
@@ -199,7 +199,8 @@ int pop3_migration_get_hdr_sha1(uint32_t mail_seq, struct istream *input,
 		   which hopefully will satisfy everybody.
 		*/
 		for (i = start = 0; i < size; i++) {
-			if (data[i] < 0x20 || data[i] >= 0x80) {
+			if ((data[i] < 0x20 || data[i] >= 0x80) &&
+			    data[i] != '\n') {
 				sha1_loop(&sha1_ctx, data + start, i-start);
 				sha1_loop(&sha1_ctx, "?", 1);
 				start = i+1;