]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
fts: Fix searching SEARCH_HEADER_ADDRESS/COMPRESS_LWSP
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Mon, 5 Feb 2018 21:51:51 +0000 (23:51 +0200)
committerVille Savolainen <ville.savolainen@dovecot.fi>
Wed, 7 Feb 2018 13:46:11 +0000 (15:46 +0200)
These are "non-language" headers that are being searched, so they need to be
searched using data language.

src/plugins/fts/fts-search-args.c

index 2e88f064d1b36ee955b344532ac4a9d3debbfc76..3dfdb4ef259c3fdf672d6c7d37f2f2eb6022eed4 100644 (file)
@@ -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);