From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 28 Feb 2025 11:23:45 +0000 (+0200)
Subject: lib-storage: Change default mail_cache_fields
X-Git-Tag: 2.4.1~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=677b30722843ff71752b4656ed2555f4ab7df909;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Change default mail_cache_fields

The new default reflects the fields used by IMAP clients commonly nowadays.

Unit test must be changed also a bit to pass with the changes, since when
returning header from cache it drops the CR character.
---

diff --git a/src/lib-settings/settings-history-core.txt b/src/lib-settings/settings-history-core.txt
index 4b999ecd13..961c83bf85 100644
--- a/src/lib-settings/settings-history-core.txt
+++ b/src/lib-settings/settings-history-core.txt
@@ -1,2 +1,3 @@
 default	service/lmtp/service_restart_request_count	unlimited	2.4.1	
 default	service/auth/unix_listener/auth-userdb/unix_listener_group		2.4.1	
+default	mail_cache_fields	flags	2.4.1	
diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index ef8ff6d440..f8396fadab 100644
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -192,7 +192,18 @@ const struct mail_storage_settings mail_storage_default_settings = {
 
 static const struct setting_keyvalue mail_storage_default_settings_keyvalue[] = {
 	{ "layout_index/mailbox_list_storage_escape_char", "^" },
-	{ "mail_cache_fields", "flags" },
+#define MAIL_CACHE_FIELDS_DEFAULT \
+	"flags " \
+	/* IMAP ENVELOPE: */ \
+	"hdr.date hdr.subject hdr.from hdr.sender hdr.reply-to hdr.to hdr.cc hdr.bcc hdr.in-reply-to hdr.message-id " \
+	/* Commonly used by clients: */ \
+	"date.received size.virtual imap.bodystructure mime.parts hdr.references " \
+	/* AppSuite, at least: */ \
+	"hdr.importance hdr.x-priority " \
+	"hdr.x-open-xchange-share-url " \
+	/* POP3: */ \
+	"pop3.uidl pop3.order"
+	{ "mail_cache_fields", MAIL_CACHE_FIELDS_DEFAULT },
 	{ "mail_never_cache_fields", "imap.envelope" },
 	{ NULL, NULL }
 };
diff --git a/src/lib-storage/test-mail.c b/src/lib-storage/test-mail.c
index 718684d8a5..a2900fe91e 100644
--- a/src/lib-storage/test-mail.c
+++ b/src/lib-storage/test-mail.c
@@ -339,6 +339,7 @@ static void test_attachment_flags_during_header_fetch(void)
 		.driver = "sdbox",
 		.extra_input = (const char *const[]) {
 			"mail_attachment_detection_options=add-flags",
+			"mail_cache_fields=flags",
 			"mail_never_cache_fields=mime.parts",
 			NULL
 		},