Mercurial > dovecot > original-hg > dovecot-1.2
changeset 5168:5dfa745c0622 HEAD
Drop X-Delivery-ID header when saving the message.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Mon, 19 Feb 2007 16:45:51 +0200 |
| parents | b11b55f8912a |
| children | 633e7e319f87 |
| files | src/lib-storage/index/mbox/mbox-save.c src/lib-storage/index/mbox/mbox-storage.c src/lib-storage/index/mbox/mbox-storage.h |
| diffstat | 3 files changed, 23 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/index/mbox/mbox-save.c Mon Feb 19 16:36:00 2007 +0200 +++ b/src/lib-storage/index/mbox/mbox-save.c Mon Feb 19 16:45:51 2007 +0200 @@ -471,14 +471,12 @@ if (write_from_line(ctx, received_date, from_envelope) < 0) ctx->failed = TRUE; else { - ctx->input = - i_stream_create_header_filter(input, - HEADER_FILTER_EXCLUDE | - HEADER_FILTER_NO_CR, - mbox_hide_headers, - mbox_hide_headers_count, - save_header_callback, - ctx); + ctx->input = i_stream_create_header_filter(input, + HEADER_FILTER_EXCLUDE | + HEADER_FILTER_NO_CR, + mbox_save_drop_headers, + mbox_save_drop_headers_count, + save_header_callback, ctx); ctx->body_output = (STORAGE(mbox->storage)->flags & MAIL_STORAGE_FLAG_SAVE_CRLF) != 0 ?
--- a/src/lib-storage/index/mbox/mbox-storage.c Mon Feb 19 16:36:00 2007 +0200 +++ b/src/lib-storage/index/mbox/mbox-storage.c Mon Feb 19 16:45:51 2007 +0200 @@ -42,6 +42,21 @@ unsigned int mbox_hide_headers_count = sizeof(mbox_hide_headers) / sizeof(mbox_hide_headers[0]); +/* A bit ugly duplification of the above list. It's safe to modify this list + without bad side effects, just keep the list sorted. */ +const char *mbox_save_drop_headers[] = { + "Content-Length", + "Status", + "X-Delivery-ID" + "X-IMAP", + "X-IMAPbase", + "X-Keywords", + "X-Status", + "X-UID" +}; +unsigned int mbox_save_drop_headers_count = + sizeof(mbox_save_drop_headers) / sizeof(mbox_save_drop_headers[0]); + extern struct mail_storage mbox_storage; extern struct mailbox mbox_mailbox;
--- a/src/lib-storage/index/mbox/mbox-storage.h Mon Feb 19 16:36:00 2007 +0200 +++ b/src/lib-storage/index/mbox/mbox-storage.h Mon Feb 19 16:45:51 2007 +0200 @@ -62,8 +62,8 @@ }; extern struct mail_vfuncs mbox_mail_vfuncs; -extern const char *mbox_hide_headers[]; -extern unsigned int mbox_hide_headers_count; +extern const char *mbox_hide_headers[], *mbox_save_drop_headers[]; +extern unsigned int mbox_hide_headers_count, mbox_save_drop_headers_count; int mbox_set_syscall_error(struct mbox_mailbox *mbox, const char *function);