Mercurial > dovecot > core-2.2
changeset 21643:19ec1861e84f
imap: Revert change to use [PARSE] in FETCH replies.
Lets leave this for v2.3. Apparently Roundcube has some workarounds that
assume [UNKNOWNCTE].
Partially reverts 8fe64e2af5b6ce7b6ffa6453beaf569dca089e59
author | Timo Sirainen <timo.sirainen@dovecot.fi> |
---|---|
date | Mon, 20 Feb 2017 14:07:23 +0200 |
parents | 720e5963f3ca |
children | eb6a6d44d977 |
files | src/imap/cmd-fetch.c |
diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/imap/cmd-fetch.c Mon Feb 20 09:18:45 2017 +0200 +++ b/src/imap/cmd-fetch.c Mon Feb 20 14:07:23 2017 +0200 @@ -229,14 +229,12 @@ } errstr = mailbox_get_last_error(cmd->client->mailbox, &error); - if (error == MAIL_ERROR_CONVERSION) { - /* BINARY found unsupported Content-Transfer-Encoding */ + if (error == MAIL_ERROR_CONVERSION || + error == MAIL_ERROR_INVALIDDATA) { + /* a) BINARY found unsupported Content-Transfer-Encoding + b) Content was invalid */ tagged_reply = t_strdup_printf( "NO ["IMAP_RESP_CODE_UNKNOWN_CTE"] %s", errstr); - } else if (error == MAIL_ERROR_INVALIDDATA) { - /* Content was invalid */ - tagged_reply = t_strdup_printf( - "NO ["IMAP_RESP_CODE_PARSE"] %s", errstr); } else if (cmd->client->set->parsed_fetch_failure != IMAP_CLIENT_FETCH_FAILURE_NO_AFTER || imap_fetch_is_failed_retry(ctx)) { /* By default we never want to reply NO to FETCH