Skip to content

Properly merge header fields #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Properly merge header fields #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/lib-storage/index/index-mail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1843,6 +1843,8 @@ void index_mail_add_temp_wanted_fields(struct mail *_mail,
struct mailbox_header_lookup_ctx *new_wanted_headers;
ARRAY_TYPE(const_string) names;
unsigned int i;
bool append;
const char * const *name;

data->wanted_fields |= fields;
if (headers == NULL) {
Expand All @@ -1855,8 +1857,18 @@ void index_mail_add_temp_wanted_fields(struct mail *_mail,
t_array_init(&names, 32);
for (i = 0; i < data->wanted_headers->count; i++)
array_append(&names, &data->wanted_headers->name[i], 1);
for (i = 0; i < headers->count; i++)
array_append(&names, &headers->name[i], 1);
for (i = 0; i < headers->count; i++) {
append = TRUE;
name = NULL;
array_foreach(&names, name) {
if (strcasecmp(*name, headers->name[i]) == 0) {
append = FALSE;
}
}
if (append) {
array_append(&names, &headers->name[i], 1);
}
}
array_append_zero(&names);
new_wanted_headers =
mailbox_header_lookup_init(_mail->box,
Expand Down