{"thread":{"id":"5910","subject":"[PATCH] git-imap-send: Strip smtp From_ header from imap message.","startedAt":"2006-10-12T22:19:35Z","lastAt":"2006-10-18T19:02:55Z","messageCount":6,"participants":["Markus Amsler","Junio C Hamano","Mike McCormack"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"28696","messageId":"452EBF77.7040301@oribi.org","threadId":"5910","inReplyTo":null,"subject":"[PATCH] git-imap-send: Strip smtp From_ header from imap message.","fromName":"Markus Amsler","fromEmail":"markus.amsler@oribi.org","sentAt":"2006-10-12T22:19:35Z","receivedAt":"2006-10-12T22:19:35Z","isPatch":true,"sender":{"key":"markus.amsler@oribi.org","avatar":null},"body":"Cyrus imap refuses messages with a 'From ' Header.\n\nSigned-off-by: Markus Amsler <markus.amsler@oribi.org>\n\n---\n   imap-send.c |    8 ++++++++\n   1 files changed, 8 insertions(+), 0 deletions(-)\n\ndiff --git a/imap-send.c b/imap-send.c\nindex 362e474..16804ab 100644\n--- a/imap-send.c\n+++ b/imap-send.c\n@@ -1226,6 +1226,14 @@ split_msg( msg_data_t *all_msgs, msg_dat\n  \tif (msg->len < 5 || strncmp( data, \"From \", 5 ))\n  \t\treturn 0;\n\n+\tp = strchr( data, '\\n' );\n+\tif (p) {\n+\t\tp = &p[1];\n+\t\tmsg->len -= p-data;\n+\t\t*ofs += p-data;\n+\t\tdata = p;\n+\t}\n+\n  \tp = strstr( data, \"\\nFrom \" );\n  \tif (p)\n  \t\tmsg->len = &p[1] - data;\n"},{"id":"29075","messageId":"7vlknegnwk.fsf@assigned-by-dhcp.cox.net","threadId":"5910","inReplyTo":"452EBF77.7040301@oribi.org","subject":"Re: [PATCH] git-imap-send: Strip smtp From_ header from imap message.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-10-18T06:04:43Z","receivedAt":"2006-10-18T06:04:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Markus Amsler <markus.amsler@oribi.org> writes:\n\n> Cyrus imap refuses messages with a 'From ' Header.\n>\n> Signed-off-by: Markus Amsler <markus.amsler@oribi.org>\n\nDo you know if this change does not upset other implementations\nof imap servers?\n\nMike, are you Ok with this change?\n\n---\n  imap-send.c |    8 ++++++++\n  1 files changed, 8 insertions(+), 0 deletions(-)\n\ndiff --git a/imap-send.c b/imap-send.c\nindex 362e474..16804ab 100644\n--- a/imap-send.c\n+++ b/imap-send.c\n@@ -1226,6 +1226,14 @@ split_msg( msg_data_t *all_msgs, msg_dat\n \tif (msg->len < 5 || strncmp( data, \"From \", 5 ))\n \t\treturn 0;\n\n+\tp = strchr( data, '\\n' );\n+\tif (p) {\n+\t\tp = &p[1];\n+\t\tmsg->len -= p-data;\n+\t\t*ofs += p-data;\n+\t\tdata = p;\n+\t}\n+\n \tp = strstr( data, \"\\nFrom \" );\n \tif (p)\n \t\tmsg->len = &p[1] - data;\n"},{"id":"29089","messageId":"4535EB99.3090006@oribi.org","threadId":"5910","inReplyTo":"7vlknegnwk.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] git-imap-send: Strip smtp From_ header from imap message.","fromName":"Markus Amsler","fromEmail":"markus.amsler@oribi.org","sentAt":"2006-10-18T08:53:45Z","receivedAt":"2006-10-18T08:53:45Z","isPatch":true,"sender":{"key":"markus.amsler@oribi.org","avatar":null},"body":"Junio C Hamano wrote:\n> Markus Amsler <markus.amsler@oribi.org> writes:\n> \n>> Cyrus imap refuses messages with a 'From ' Header.\n>>\n>> Signed-off-by: Markus Amsler <markus.amsler@oribi.org>\n> \n> Do you know if this change does not upset other implementations\n> of imap servers?\nI only tested it with cyrus 2.1.18 on debian. I did some research: The \nFrom_ header field was introduced in rfc976 which only affects UUCP(Unix \nto Unix CoPy). I assume it's an invalid header field in SMTP/IMAP, and \nmost implementation ignores it.\nI'm no mail header guru, so I could be wrong\n\nMarkus\n> \n> Mike, are you Ok with this change?\n> \n> ---\n>   imap-send.c |    8 ++++++++\n>   1 files changed, 8 insertions(+), 0 deletions(-)\n> \n> diff --git a/imap-send.c b/imap-send.c\n> index 362e474..16804ab 100644\n> --- a/imap-send.c\n> +++ b/imap-send.c\n> @@ -1226,6 +1226,14 @@ split_msg( msg_data_t *all_msgs, msg_dat\n>  \tif (msg->len < 5 || strncmp( data, \"From \", 5 ))\n>  \t\treturn 0;\n> \n> +\tp = strchr( data, '\\n' );\n> +\tif (p) {\n> +\t\tp = &p[1];\n> +\t\tmsg->len -= p-data;\n> +\t\t*ofs += p-data;\n> +\t\tdata = p;\n> +\t}\n> +\n>  \tp = strstr( data, \"\\nFrom \" );\n>  \tif (p)\n>  \t\tmsg->len = &p[1] - data;\n> \n> \n"},{"id":"29102","messageId":"7vejt53olg.fsf@assigned-by-dhcp.cox.net","threadId":"5910","inReplyTo":"45367A5F.7060507@codeweavers.com","subject":"Re: [PATCH] git-imap-send: Strip smtp From_ header from imap message.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-10-18T10:28:11Z","receivedAt":"2006-10-18T10:28:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Mike McCormack <mike@codeweavers.com> writes:\n\n> Junio C Hamano wrote:\n>> Markus Amsler <markus.amsler@oribi.org> writes:\n>>\n>>> Cyrus imap refuses messages with a 'From ' Header.\n>>>\n>>> Signed-off-by: Markus Amsler <markus.amsler@oribi.org>\n>>\n>> Do you know if this change does not upset other implementations\n>> of imap servers?\n>>\n>> Mike, are you Ok with this change?\n>\n> Works for me with Courier IMAP.  I'm no expert on mail headers either,\n> so no objections from me.\n>\n> Mike\n\nThanks; then will apply.\n\nBy the way, Markus, did you send the patch with imap-send?  It\nhad a funny whitespace corruptions.\n"},{"id":"29109","messageId":"453615E6.4090008@oribi.org","threadId":"5910","inReplyTo":"7vejt53olg.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] git-imap-send: Strip smtp From_ header from imap message.","fromName":"Markus Amsler","fromEmail":"markus.amsler@oribi.org","sentAt":"2006-10-18T11:54:14Z","receivedAt":"2006-10-18T11:54:14Z","isPatch":true,"sender":{"key":"markus.amsler@oribi.org","avatar":null},"body":"Junio C Hamano wrote:\n> Mike McCormack <mike@codeweavers.com> writes:\n> \n>> Junio C Hamano wrote:\n>>> Markus Amsler <markus.amsler@oribi.org> writes:\n>>>\n>>>> Cyrus imap refuses messages with a 'From ' Header.\n>>>>\n>>>> Signed-off-by: Markus Amsler <markus.amsler@oribi.org>\n>>> Do you know if this change does not upset other implementations\n>>> of imap servers?\n>>>\n>>> Mike, are you Ok with this change?\n>> Works for me with Courier IMAP.  I'm no expert on mail headers either,\n>> so no objections from me.\n>>\n>> Mike\n> \n> Thanks; then will apply.\n> \n> By the way, Markus, did you send the patch with imap-send?  It\n> had a funny whitespace corruptions.\nNo, I was too lazy to set up an imap config for one patch. So I used git \ndiff an copy pasted it into Thunderbird. Sorry.\n\nMarkus\n"},{"id":"29101","messageId":"45367A5F.7060507@codeweavers.com","threadId":"5910","inReplyTo":"7vlknegnwk.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] git-imap-send: Strip smtp From_ header from imap message.","fromName":"Mike McCormack","fromEmail":"mike@codeweavers.com","sentAt":"2006-10-18T19:02:55Z","receivedAt":"2006-10-18T19:02:55Z","isPatch":true,"sender":{"key":"mike@codeweavers.com","avatar":null},"body":"\nJunio C Hamano wrote:\n> Markus Amsler <markus.amsler@oribi.org> writes:\n> \n>> Cyrus imap refuses messages with a 'From ' Header.\n>>\n>> Signed-off-by: Markus Amsler <markus.amsler@oribi.org>\n> \n> Do you know if this change does not upset other implementations\n> of imap servers?\n> \n> Mike, are you Ok with this change?\n\nWorks for me with Courier IMAP.  I'm no expert on mail headers either, \nso no objections from me.\n\nMike\n"}]}