Mercurial > dovecot > core-2.2
changeset 22234:437360a243ee
imapc: Fix prefetching specific headers
FETCH BODY[HEADER.FIELDS ...] shouldn't be used if imapc_features doesn't
include fetch-headers. Also neither this nor BODY[HEADER] should be sent
if we already have header/body stream.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Tue, 13 Jun 2017 00:57:08 +0300 |
| parents | 6d2107608c1b |
| children | cdb9410662d1 |
| files | src/lib-storage/index/imapc/imapc-mail-fetch.c |
| diffstat | 1 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/index/imapc/imapc-mail-fetch.c Tue Jun 13 00:55:36 2017 +0300 +++ b/src/lib-storage/index/imapc/imapc-mail-fetch.c Tue Jun 13 00:57:08 2017 +0300 @@ -214,6 +214,9 @@ uint32_t seq; unsigned int i; + i_assert(headers == NULL || + IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_FETCH_HEADERS)); + if (_mail->lookup_abort != MAIL_LOOKUP_ABORT_NEVER) { mail_set_aborted(_mail); return -1; @@ -374,6 +377,7 @@ struct imapc_mailbox *mbox = (struct imapc_mailbox *)_mail->box; struct index_mail_data *data = &mail->imail.data; enum mail_fetch_field fields; + const char *const *headers = NULL; if (mbox->prev_mail_cache.uid == _mail->uid) imapc_mail_cache_get(mail, &mbox->prev_mail_cache); @@ -381,12 +385,17 @@ imapc_mail_update_access_parts(&mail->imail); fields = imapc_mail_get_wanted_fetch_fields(mail); - if (fields != 0 || - (data->wanted_headers != NULL && - !imapc_mail_has_headers_in_cache(&mail->imail, data->wanted_headers))) T_BEGIN { - if (imapc_mail_send_fetch(_mail, fields, - data->wanted_headers == NULL ? NULL : - data->wanted_headers->name) > 0) + if (data->wanted_headers != NULL && data->stream == NULL && + (fields & MAIL_FETCH_STREAM_HEADER) == 0 && + !imapc_mail_has_headers_in_cache(&mail->imail, data->wanted_headers)) { + /* fetch specific headers */ + if (IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_FETCH_HEADERS)) + headers = data->wanted_headers->name; + else + fields |= MAIL_FETCH_STREAM_HEADER; + } + if (fields != 0 || headers != NULL) T_BEGIN { + if (imapc_mail_send_fetch(_mail, fields, headers) > 0) mail->imail.data.prefetch_sent = TRUE; } T_END; return !mail->imail.data.prefetch_sent;