From: Michael Witten Date: Sat, 18 Apr 2009 17:02:04 GMT Subject: [PATCH RFC3.5 08/12] send-email: Move Subject sanitization from --compose code to send_message Message-ID: <1240074128-16132-9-git-send-email-mfwitten@gmail.com> In-Reply-To: <1240074128-16132-8-git-send-email-mfwitten@gmail.com> Signed-off-by: Michael Witten --- git-send-email.perl | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index f3e2ccd..b9a6d42 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -676,12 +676,7 @@ EOT $need_8bit_cte = 0; } elsif (/^Subject:\s*(.+)\s*$/i) { $initial_subject = $1; - my $subject = $initial_subject; - $_ = "Subject: " . - ($subject =~ /[^[:ascii:]]/ ? - quote_rfc2047($subject) : - $subject) . - "\n"; + next; } elsif (/^In-Reply-To:\s*(.+)\s*$/i) { $initial_reply_to = $1; next; @@ -914,9 +909,11 @@ sub send_message my $sanitized_sender = sanitize_address($sender); make_message_id() unless defined($message_id); + my $sanitized_subject = ($subject =~ /[^[:ascii:]]/) ? quote_rfc2047($subject) : $subject; + my $header = "From: $sanitized_sender To: $to${ccline} -Subject: $subject +Subject: $sanitized_subject Date: $date Message-Id: $message_id X-Mailer: git-send-email $gitversion -- 1.6.2.2.479.g2aec