diff options
| author | Markus Amsler <markus.amsler@oribi.org> | 2006-10-13 02:19:35 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-18 14:34:46 +0400 |
| commit | e0b0830726286287744cc9e1a629a534bbe75452 (patch) | |
| tree | be104733f5728bccf3a58dd4183dc05f28cffc0f | |
| parent | 17b96be29afd71577374e9deee663120b18eb8f1 (diff) | |
git-imap-send: Strip smtp From_ header from imap message.v1.4.3
Cyrus imap refuses messages with a 'From ' Header.
[jc: Mike McCormack says this is fine with Courier as well.]
Signed-off-by: Markus Amsler <markus.amsler@oribi.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | imap-send.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/imap-send.c b/imap-send.c index 362e474374..16804ab286 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1226,6 +1226,14 @@ split_msg( msg_data_t *all_msgs, msg_data_t *msg, int *ofs ) if (msg->len < 5 || strncmp( data, "From ", 5 )) return 0; + p = strchr( data, '\n' ); + if (p) { + p = &p[1]; + msg->len -= p-data; + *ofs += p-data; + data = p; + } + p = strstr( data, "\nFrom " ); if (p) msg->len = &p[1] - data; |