Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugzilla Bug 306207: sendmail support under Windows bypasses message encoding

Browse Source 
Patch by byron jones (glob) <bugzilla@glob.com.au>
r=wurblzap, a=myk


git-svn-id: svn://10.0.0.236/trunk@184056 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wurblzap%gmail.com
2005-11-02 20:50:46 +00:00
parent f05f169d56
commit 2873d2c556
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
View File

@@ -630,10 +630,22 @@ sub MessageToMTA {
my ($msg) = (@_);
return if (Param('mail_delivery_method') eq "none");
my ($header, $body) = $msg =~ /(.*?\n)\n(.*)/s ? ($1, $2) : ('', $msg);
my $headers;
if (Param('utf8') and (!is_7bit_clean($header) or !is_7bit_clean($body))) {
($headers, $body) = encode_message($header, $body);
} else {
my @header_lines = split(/\n/, $header);
$headers = new Mail::Header \@header_lines, Modify => 0;
}
if (Param("mail_delivery_method") eq "sendmail" && $^O =~ /MSWin32/i) {
open(SENDMAIL, '|' . SENDMAIL_EXE . ' -t -i') ||
die "Failed to execute " . SENDMAIL_EXE . ": $!\n";
print SENDMAIL $msg;
print SENDMAIL $headers->as_string;
print SENDMAIL "\n";
print SENDMAIL $body;
close SENDMAIL;
return;
}
@@ -650,16 +662,6 @@ sub MessageToMTA {
$Mail::Mailer::testfile::config{outfile} = "$datadir/mailer.testfile";
}
my ($header, $body) = $msg =~ /(.*?\n)\n(.*)/s ? ($1, $2) : ('', $msg);
my $headers;
if (Param('utf8') and (!is_7bit_clean($header) or !is_7bit_clean($body))) {
($headers, $body) = encode_message($header, $body);
} else {
my @header_lines = split(/\n/, $header);
$headers = new Mail::Header \@header_lines, Modify => 0;
}
$mailer->open($headers->header_hashref);
print $mailer $body;
$mailer->close;