Commit 321412db authored by cyeh%bluemartini.com's avatar cyeh%bluemartini.com

fix for 50698: parameter for sendmail deferred mode

parent 8fa450e9
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment