diff options
| author | Sam Varshavchik | 2018-12-03 20:51:19 -0500 |
|---|---|---|
| committer | Sam Varshavchik | 2018-12-03 20:51:19 -0500 |
| commit | e01dd5b2f84fd2a18c0ffc48096194f082b12aae (patch) | |
| tree | 79f4cb930297a05b7394e84e8ed20f0ed78bd1ea /imap/imapd.c | |
| parent | dca4b607379150d58cacf1aec22ae6ef37988ca2 (diff) | |
| download | courier-libs-e01dd5b2f84fd2a18c0ffc48096194f082b12aae.tar.bz2 | |
Hideki SAKAMOTO <hsakamt@tsnr.com>: Thunderbird sends malformed message
Diffstat (limited to 'imap/imapd.c')
| -rw-r--r-- | imap/imapd.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/imap/imapd.c b/imap/imapd.c index 56cdc61..c616149 100644 --- a/imap/imapd.c +++ b/imap/imapd.c @@ -714,7 +714,8 @@ static int store_mailbox(const char *tag, const char *mailbox, time_t timestamp, struct imaptoken *curtoken, unsigned long *new_uidv, - unsigned long *new_uid) + unsigned long *new_uid, + int *utf8_error) { unsigned long nbytes=curtoken->tokennum; char *tmpname; @@ -797,10 +798,8 @@ static int store_mailbox(const char *tag, const char *mailbox, if ((rfc2045_parser->rfcviolation & RFC2045_ERR8BITHEADER) && curtoken->tokentype != IT_LITERAL8_STRING_START) { - errmsg=" NO [ALERT] Your IMAP client does not appear to " - "correctly implement Unicode messages, " - "see https://tools.ietf.org/html/rfc6855.html\r\n"; - errflag=1; + /* in order to [ALERT] the client */ + *utf8_error=1; } rfc2045_free(rfc2045_parser); @@ -3911,6 +3910,7 @@ static int append(const char *tag, const char *mailbox, const char *path) char access_rights[8]; struct imaptoken *curtoken; int need_rparen; + int utf8_error=0; if (access(path, 0)) { @@ -4030,7 +4030,7 @@ static int append(const char *tag, const char *mailbox, const char *path) acl_flags_adjust(access_rights, &flags) ? NULL:keywords, timestamp, - curtoken, &new_uidv, &new_uid)) + curtoken, &new_uidv, &new_uid, &utf8_error)) { libmail_kwmDestroy(keywords); unread('\n'); @@ -4057,7 +4057,13 @@ static int append(const char *tag, const char *mailbox, const char *path) writen(new_uidv); writes(" "); writen(new_uid); - writes("] APPEND Ok.\r\n"); + writes("] APPEND Ok."); + if (utf8_error) { + writes(" [ALERT] Your IMAP client does not appear to " + "correctly implement Unicode messages, " + "see https://tools.ietf.org/html/rfc6855.html"); + } + writes("\r\n"); return (0); } |