@matheusbsbs / matheus-bagliano / commits / e0b0830726
Fork 0

git-imap-send: Strip smtp From_ header from imap message.

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>

Markus Amsler committed Oct 13, 2006 at 00:19 UTC e0b0830726286287744cc9e1a629a534bbe75452
1 file changed +8
imap-send.c
+8
@@ -1226,6 +1226,14 @@ split_msg( msg_data_t *all_msgs, msg_data_t *msg, int *ofs )
1226 if (msg->len < 5 || strncmp( data, "From ", 5 ))
1227 return 0;
1228
1229 + p = strchr( data, '\n' );
1230 + if (p) {
1231 + p = &p[1];
1232 + msg->len -= p-data;
1233 + *ofs += p-data;
1234 + data = p;
1235 + }
1236 +
1237 p = strstr( data, "\nFrom " );
1238 if (p)
1239 msg->len = &p[1] - data;