From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 5 Feb 2018 21:51:51 +0000 (+0200)
Subject: fts: Fix searching SEARCH_HEADER_ADDRESS/COMPRESS_LWSP
X-Git-Tag: 2.2.35~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40ca9c99773a80c9e755804ce64ce3a0ef9c1dfe;p=thirdparty%2Fdovecot%2Fcore.git

fts: Fix searching SEARCH_HEADER_ADDRESS/COMPRESS_LWSP

These are "non-language" headers that are being searched, so they need to be
searched using data language.
---

diff --git a/src/plugins/fts/fts-search-args.c b/src/plugins/fts/fts-search-args.c
index 2e88f064d1..3dfdb4ef25 100644
--- a/src/plugins/fts/fts-search-args.c
+++ b/src/plugins/fts/fts-search-args.c
@@ -153,7 +153,9 @@ static int fts_search_arg_expand(struct fts_backend *backend, pool_t pool,
 	struct mail_search_arg *or_arg, *orig_arg = *argp;
 	const char *error, *orig_token = orig_arg->value.str;
 
-	if ((*argp)->type == SEARCH_HEADER &&
+	if (((*argp)->type == SEARCH_HEADER ||
+	     (*argp)->type == SEARCH_HEADER_ADDRESS ||
+	     (*argp)->type == SEARCH_HEADER_COMPRESS_LWSP) &&
 	    !fts_header_has_language((*argp)->hdr_field_name)) {
 		/* use only the data-language */
 		languages = fts_user_get_data_languages(backend->ns->user);