* [PATCH] git-send-email.perl: Fold long header lines to 78 chars
@ 2009-10-05 16:24 Joe Perches
2009-10-08 5:02 ` Junio C Hamano
0 siblings, 1 reply; 7+ messages in thread
From: Joe Perches @ 2009-10-05 16:24 UTC (permalink / raw)
To: git; +Cc: Jay Soffian
Some MTAs reject or filter long header lines which can
be generated if the cc list is only a few entries.
Fold long header lines to 78 chars to be more rfc compliant.
Signed-off-by: Joe Perches <joe@perches.com>
diff --git a/git-send-email.perl b/git-send-email.perl
index dd821f7..cb8b48b 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -814,6 +814,41 @@ sub sanitize_address
}
+# Fold header lines to 78 chars if possible for better RFC 2822 compliance
+# Does not terminate last line with newline
+sub fold_header
+{
+ my ($folded_line, $separator, @entries) = @_;
+ my $folded_header = "";
+ my $count = 0;
+ my $trim_sep = $separator;
+
+ $trim_sep =~ s/\s+$//;
+
+ foreach my $entry (@entries) {
+ if ($count == 0) {
+ $folded_line = "$folded_line$entry";
+ } elsif ((length($folded_line) + length($entry)) > 78) {
+ if ($folded_header ne "") {
+ $folded_header = "$folded_header$trim_sep\n";
+ }
+ $folded_header = "$folded_header$folded_line";
+ $folded_line = " $entry";
+ } else {
+ $folded_line = "$folded_line$separator$entry";
+ }
+ $count++;
+ }
+
+ if ($count == 0) {
+ $folded_header = "$folded_line";
+ } else {
+ $folded_header = "$folded_header$trim_sep\n$folded_line";
+ }
+
+ return "$folded_header";
+}
+
# Returns 1 if the message was sent, and 0 otherwise.
# In actuality, the whole program dies when there
# is an error sending a message.
@@ -835,10 +870,10 @@ sub send_message
$gitversion = Git::version();
}
- my $cc = join(", ", unique_email_list(@cc));
+ @cc = unique_email_list(@cc);
my $ccline = "";
- if ($cc ne '') {
- $ccline = "\nCc: $cc";
+ if (@cc gt 0) {
+ $ccline = fold_header("\nCc: ", ", ", @cc);
}
my $sanitized_sender = sanitize_address($sender);
make_message_id() unless defined($message_id);
@@ -976,7 +1011,7 @@ X-Mailer: git-send-email $gitversion
if ($smtp_server !~ m#^/#) {
print "Server: $smtp_server\n";
print "MAIL FROM:<$raw_from>\n";
- print "RCPT TO:".join(',',(map { "<$_>" } @recipients))."\n";
+ print fold_header("RCPT TO:", ",", map { "<$_>" } @recipients)."\n";
} else {
print "Sendmail: $smtp_server ".join(' ',@sendmail_parameters)."\n";
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] git-send-email.perl: Fold long header lines to 78 chars
2009-10-05 16:24 [PATCH] git-send-email.perl: Fold long header lines to 78 chars Joe Perches
@ 2009-10-08 5:02 ` Junio C Hamano
2009-10-08 5:28 ` Joe Perches
0 siblings, 1 reply; 7+ messages in thread
From: Junio C Hamano @ 2009-10-08 5:02 UTC (permalink / raw)
To: Joe Perches; +Cc: git, Jay Soffian
Joe Perches <joe@perches.com> writes:
> Some MTAs reject or filter long header lines which can
> be generated if the cc list is only a few entries.
>
> Fold long header lines to 78 chars to be more rfc compliant.
>
> Signed-off-by: Joe Perches <joe@perches.com>
>
> diff --git a/git-send-email.perl b/git-send-email.perl
> index dd821f7..cb8b48b 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -835,10 +870,10 @@ sub send_message
> $gitversion = Git::version();
> }
>
> - my $cc = join(", ", unique_email_list(@cc));
> + @cc = unique_email_list(@cc);
> my $ccline = "";
> - if ($cc ne '') {
> - $ccline = "\nCc: $cc";
> + if (@cc gt 0) {
"gt"? I think you meant (@cc > 0) but you can also say "if (@cc) {" which
would most clearly convey what you want to say..
> + $ccline = fold_header("\nCc: ", ", ", @cc);
> }
> my $sanitized_sender = sanitize_address($sender);
> make_message_id() unless defined($message_id);
> @@ -976,7 +1011,7 @@ X-Mailer: git-send-email $gitversion
> if ($smtp_server !~ m#^/#) {
> print "Server: $smtp_server\n";
> print "MAIL FROM:<$raw_from>\n";
> - print "RCPT TO:".join(',',(map { "<$_>" } @recipients))."\n";
> + print fold_header("RCPT TO:", ",", map { "<$_>" } @recipients)."\n";
I do not think this hunk is correct.
Shouldn't we be rather repeating "RCPT TO: " for each recipient, as
RFC2821 4.1.1.3 says (this is an issue with the original code)? I do not
think SMTP's "RCPT TO" command has the notion of continuation line used
for the payload (i.e. RFC 2822 Internet Message Format), and folding the
line is a new bug this patch introduces.
> } else {
> print "Sendmail: $smtp_server ".join(' ',@sendmail_parameters)."\n";
> }
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] git-send-email.perl: Fold long header lines to 78 chars
2009-10-08 5:02 ` Junio C Hamano
@ 2009-10-08 5:28 ` Joe Perches
2009-10-08 16:27 ` Junio C Hamano
0 siblings, 1 reply; 7+ messages in thread
From: Joe Perches @ 2009-10-08 5:28 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Jay Soffian
On Wed, 2009-10-07 at 22:02 -0700, Junio C Hamano wrote:
> Joe Perches <joe@perches.com> writes:
> > Some MTAs reject or filter long header lines which can
> > be generated if the cc list is only a few entries.
> > Fold long header lines to 78 chars to be more rfc compliant.
> >
> > - my $cc = join(", ", unique_email_list(@cc));
It's probably better/simpler to not use fold_header and
just do the same join as "my $to"
my $cc = join(",\n\t", unique_email_list(@cc));
> > if ($smtp_server !~ m#^/#) {
> > print "Server: $smtp_server\n";
> > print "MAIL FROM:<$raw_from>\n";
> > - print "RCPT TO:".join(',',(map { "<$_>" } @recipients))."\n";
> > + print fold_header("RCPT TO:", ",", map { "<$_>" } @recipients)."\n";
> I do not think this hunk is correct.
> Shouldn't we be rather repeating "RCPT TO: " for each recipient, as
> RFC2821 4.1.1.3 says (this is an issue with the original code)?
Looks like you're right.
Want a new patch or will you fix both issues?
I suggest using the same join as "To:" for "Cc:" and
multiple single line "RCPT TO:"s.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] git-send-email.perl: Fold long header lines to 78 chars
2009-10-08 5:28 ` Joe Perches
@ 2009-10-08 16:27 ` Junio C Hamano
2009-10-08 17:03 ` [PATCH v2] git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s Joe Perches
0 siblings, 1 reply; 7+ messages in thread
From: Junio C Hamano @ 2009-10-08 16:27 UTC (permalink / raw)
To: Joe Perches; +Cc: git, Jay Soffian
Joe Perches <joe@perches.com> writes:
>> I do not think this hunk is correct.
>> Shouldn't we be rather repeating "RCPT TO: " for each recipient, as
>> RFC2821 4.1.1.3 says (this is an issue with the original code)?
>
> Looks like you're right.
>
> Want a new patch or will you fix both issues?
>
> I suggest using the same join as "To:" for "Cc:" and
> multiple single line "RCPT TO:"s.
Sure. Please make it so.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
2009-10-08 16:27 ` Junio C Hamano
@ 2009-10-08 17:03 ` Joe Perches
2009-10-09 6:50 ` Junio C Hamano
2009-10-10 0:57 ` Junio C Hamano
0 siblings, 2 replies; 7+ messages in thread
From: Joe Perches @ 2009-10-08 17:03 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Jay Soffian
Some MTAs reject Cc: lines longer than 78 chars.
Avoid this by using the same join as "To:" ",\n\t"
so each subsequent Cc entry is on a new line.
RCPT TO: should have a single entry per line.
see: http://www.ietf.org/rfc/rfc2821.txt
Signed-off-by: Joe Perches <joe@perches.com>
diff --git a/git-send-email.perl b/git-send-email.perl
index dd821f7..ce81425 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -835,7 +835,7 @@ sub send_message
$gitversion = Git::version();
}
- my $cc = join(", ", unique_email_list(@cc));
+ my $cc = join(",\n\t", unique_email_list(@cc));
my $ccline = "";
if ($cc ne '') {
$ccline = "\nCc: $cc";
@@ -976,7 +976,9 @@ X-Mailer: git-send-email $gitversion
if ($smtp_server !~ m#^/#) {
print "Server: $smtp_server\n";
print "MAIL FROM:<$raw_from>\n";
- print "RCPT TO:".join(',',(map { "<$_>" } @recipients))."\n";
+ foreach my $entry (@recipients) {
+ print "RCPT TO:<$entry>\n";
+ }
} else {
print "Sendmail: $smtp_server ".join(' ',@sendmail_parameters)."\n";
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2] git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
2009-10-08 17:03 ` [PATCH v2] git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s Joe Perches
@ 2009-10-09 6:50 ` Junio C Hamano
2009-10-10 0:57 ` Junio C Hamano
1 sibling, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2009-10-09 6:50 UTC (permalink / raw)
To: Joe Perches; +Cc: Junio C Hamano, git, Jay Soffian
Joe Perches <joe@perches.com> writes:
> Some MTAs reject Cc: lines longer than 78 chars.
> Avoid this by using the same join as "To:" ",\n\t"
> so each subsequent Cc entry is on a new line.
>
> RCPT TO: should have a single entry per line.
> see: http://www.ietf.org/rfc/rfc2821.txt
>
> Signed-off-by: Joe Perches <joe@perches.com>
Thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
2009-10-08 17:03 ` [PATCH v2] git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s Joe Perches
2009-10-09 6:50 ` Junio C Hamano
@ 2009-10-10 0:57 ` Junio C Hamano
1 sibling, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2009-10-10 0:57 UTC (permalink / raw)
To: Joe Perches; +Cc: git, Jay Soffian
This breaks t9001 since it expects an old (and probably incorrect) RCPT TO:
lines. I fixed them up.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-10-10 1:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-10-05 16:24 [PATCH] git-send-email.perl: Fold long header lines to 78 chars Joe Perches
2009-10-08 5:02 ` Junio C Hamano
2009-10-08 5:28 ` Joe Perches
2009-10-08 16:27 ` Junio C Hamano
2009-10-08 17:03 ` [PATCH v2] git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s Joe Perches
2009-10-09 6:50 ` Junio C Hamano
2009-10-10 0:57 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).