changeset 19614:87d9089d2c76

pop3-migration: Ignore Return-Path: header when matching UIDLs by header hashes This fixes matching between Yahoo IMAP and Yahoo POP3
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Sun, 24 Jan 2016 16:25:52 +0200
parents fee417f10682
children 152ed3cd2bad
files src/plugins/pop3-migration/pop3-migration-plugin.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/pop3-migration/pop3-migration-plugin.c	Sat Jan 23 15:48:14 2016 +0200
+++ b/src/plugins/pop3-migration/pop3-migration-plugin.c	Sun Jan 24 16:25:52 2016 +0200
@@ -62,8 +62,10 @@
 	unsigned int uidl_ordered:1;
 };
 
+/* NOTE: these headers must be sorted */
 static const char *hdr_hash_skip_headers[] = {
 	"Content-Length",
+	"Return-Path", /* Yahoo IMAP has Return-Path, Yahoo POP3 doesn't */
 	"Status",
 	"X-IMAP",
 	"X-IMAPbase",