зеркало из https://github.com/mozilla/gecko-dev.git
fix for 50698: parameter for sendmail deferred mode
This commit is contained in:
Родитель
ec741b9cb3
Коммит
19bbc79051
|
@ -261,6 +261,10 @@ DefParam("shutdownhtml",
|
|||
"l",
|
||||
"");
|
||||
|
||||
DefParam("sendmailnow",
|
||||
"If this is on, Bugzilla will tell sendmail to send any e-mail immediately. If you have a large number of users with a large amount of e-mail traffic, enabling this option may dramatically slow down Bugzilla. Best used for smaller installations of Bugzilla.",
|
||||
"b",
|
||||
0);
|
||||
|
||||
DefParam("passwordmail",
|
||||
q{The email that gets sent to people to tell them their password. Within
|
||||
|
|
|
@ -584,7 +584,12 @@ sub NewProcessOnePerson ($$\@\%\%\%$$$$) {
|
|||
my $template = Param("newchangedmail");
|
||||
|
||||
my $msg = PerformSubsts($template, \%substs);
|
||||
open(SENDMAIL, "|/usr/lib/sendmail -ODeliveryMode=deferred -t") ||
|
||||
|
||||
my $sendmailparam = "-ODeliveryMode=deferred";
|
||||
if (Param("sendmailnow")) {
|
||||
my $sendmailparam = "";
|
||||
}
|
||||
open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t") ||
|
||||
die "Can't open sendmail";
|
||||
|
||||
print SENDMAIL trim($msg) . "\n";
|
||||
|
@ -647,8 +652,12 @@ sub ProcessOneBug {
|
|||
if (!$regenerate) {
|
||||
# Note: fixaddresses may result in a Cc: only. This seems
|
||||
# harmless.
|
||||
my $sendmailparam = "-ODeliveryMode=deferred";
|
||||
if (Param("sendmailnow")) {
|
||||
my $sendmailparam = "";
|
||||
}
|
||||
open(SENDMAIL,
|
||||
"|/usr/lib/sendmail -ODeliveryMode=deferred -t") ||
|
||||
"|/usr/lib/sendmail $sendmailparam -t") ||
|
||||
die "Can't open sendmail";
|
||||
|
||||
print SENDMAIL $msg;
|
||||
|
|
Загрузка…
Ссылка в новой задаче