зеркало из https://github.com/mozilla/pjs.git
Fix for bug 117055: Emails were being truncated if they contained a line with nothing but a period on them. We now pass -i to
sendmail and its clones to tell it to ignore periods (since we close the pipe when we're done, rather than signalling it with a period). Has been tested with sendmail and postfix. Patch by Dave Miller <justdave@syndicomm.com> r= afranke, bugzilla@bkor.dhs.org, jake
This commit is contained in:
Родитель
a5f6f6c5b3
Коммит
8a7b873c47
|
@ -101,7 +101,7 @@ sub MailPasswordToken {
|
|||
my $emailsuffix = &::Param('emailsuffix');
|
||||
$token = &::url_quote($token);
|
||||
|
||||
open SENDMAIL, "|/usr/lib/sendmail -t";
|
||||
open SENDMAIL, "|/usr/lib/sendmail -ti";
|
||||
|
||||
print SENDMAIL qq|From: bugzilla-daemon
|
||||
To: $emailaddress$emailsuffix
|
||||
|
@ -144,7 +144,7 @@ sub Cancel {
|
|||
my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
|
||||
|
||||
# Notify the user via email about the cancellation.
|
||||
open SENDMAIL, "|/usr/lib/sendmail -t";
|
||||
open SENDMAIL, "|/usr/lib/sendmail -ti";
|
||||
print SENDMAIL qq|From: bugzilla-daemon
|
||||
To: $username
|
||||
Subject: "$tokentype" token cancelled
|
||||
|
|
|
@ -762,7 +762,7 @@ sub MailPassword {
|
|||
"login" => $login,
|
||||
"password" => $password});
|
||||
|
||||
open SENDMAIL, "|/usr/lib/sendmail -t";
|
||||
open SENDMAIL, "|/usr/lib/sendmail -ti";
|
||||
print SENDMAIL $msg;
|
||||
close SENDMAIL;
|
||||
}
|
||||
|
|
|
@ -101,7 +101,7 @@ sub MailPasswordToken {
|
|||
my $emailsuffix = &::Param('emailsuffix');
|
||||
$token = &::url_quote($token);
|
||||
|
||||
open SENDMAIL, "|/usr/lib/sendmail -t";
|
||||
open SENDMAIL, "|/usr/lib/sendmail -ti";
|
||||
|
||||
print SENDMAIL qq|From: bugzilla-daemon
|
||||
To: $emailaddress$emailsuffix
|
||||
|
@ -144,7 +144,7 @@ sub Cancel {
|
|||
my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
|
||||
|
||||
# Notify the user via email about the cancellation.
|
||||
open SENDMAIL, "|/usr/lib/sendmail -t";
|
||||
open SENDMAIL, "|/usr/lib/sendmail -ti";
|
||||
print SENDMAIL qq|From: bugzilla-daemon
|
||||
To: $username
|
||||
Subject: "$tokentype" token cancelled
|
||||
|
|
|
@ -1433,7 +1433,7 @@ sub RemoveVotes {
|
|||
if (Param('sendmailnow')) {
|
||||
$sendmailparm = '';
|
||||
}
|
||||
if (open(SENDMAIL, "|/usr/lib/sendmail $sendmailparm -t")) {
|
||||
if (open(SENDMAIL, "|/usr/lib/sendmail $sendmailparm -ti")) {
|
||||
my %substs;
|
||||
|
||||
$substs{"to"} = $name;
|
||||
|
|
|
@ -114,7 +114,7 @@ sub MailMessage {
|
|||
$header.= "Subject: $subject\n\n";
|
||||
|
||||
open(SENDMAIL,
|
||||
"|/usr/lib/sendmail -ODeliveryMode=background -t") ||
|
||||
"|/usr/lib/sendmail -ODeliveryMode=background -ti") ||
|
||||
die "Can't open sendmail";
|
||||
print SENDMAIL $header . $message . "\n";
|
||||
close SENDMAIL;
|
||||
|
|
|
@ -150,7 +150,7 @@ $msg .= "Subject: Moving bug(s) $buglist\n\n";
|
|||
$msg .= $xml . "\n";
|
||||
|
||||
open(SENDMAIL,
|
||||
"|/usr/lib/sendmail -ODeliveryMode=background -t") ||
|
||||
"|/usr/lib/sendmail -ODeliveryMode=background -ti") ||
|
||||
die "Can't open sendmail";
|
||||
print SENDMAIL $msg;
|
||||
close SENDMAIL;
|
||||
|
|
|
@ -771,7 +771,7 @@ sub NewProcessOnePerson ($$$$$$$$$$$$) {
|
|||
}
|
||||
|
||||
if ($enableSendMail == 1) {
|
||||
open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t") ||
|
||||
open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -ti") ||
|
||||
die "Can't open sendmail";
|
||||
|
||||
print SENDMAIL trim($msg) . "\n";
|
||||
|
|
|
@ -64,7 +64,7 @@ foreach my $email (sort (keys %bugs)) {
|
|||
}
|
||||
|
||||
my $sendmailparam = Param('sendmailnow') ? '' : "-ODeliveryMode=deferred";
|
||||
open SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t"
|
||||
open SENDMAIL, "|/usr/lib/sendmail $sendmailparam -ti"
|
||||
or die "Can't open sendmail";
|
||||
print SENDMAIL $msg;
|
||||
close SENDMAIL;
|
||||
|
|
Загрузка…
Ссылка в новой задаче