From b7fbcf61cf1267564edaf343833fa15f1a806430 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Fri, 23 Apr 2010 18:01:40 +0200
Subject: Bug 561362: Remove the 'sendmailnow' parameter r=justdave a=LpSolit

---
 Bugzilla/Config/MTA.pm                         |  6 ------
 Bugzilla/Mailer.pm                             |  2 --
 docs/en/xml/administration.xml                 | 16 ----------------
 docs/en/xml/glossary.xml                       |  2 --
 docs/en/xml/installation.xml                   |  9 ++-------
 template/en/default/admin/params/mta.html.tmpl |  8 --------
 6 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm
index b1e3ab1a4..c90e5dc76 100644
--- a/Bugzilla/Config/MTA.pm
+++ b/Bugzilla/Config/MTA.pm
@@ -64,12 +64,6 @@ sub get_param_list {
    checker => \&check_theschwartz_available,
   },
 
-  {
-   name => 'sendmailnow',
-   type => 'b',
-   default => 1
-  },
-
   {
    name => 'smtpserver',
    type => 't',
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index fb9c5a7ca..596e8ab65 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -145,8 +145,6 @@ sub MessageToMTA {
                 push(@args, "-f$from_email") if $from_email;
             }
         }
-        push(@args, "-ODeliveryMode=deferred")
-            if !Bugzilla->params->{"sendmailnow"};
     }
     else {
         # Sendmail will automatically append our hostname to the From
diff --git a/docs/en/xml/administration.xml b/docs/en/xml/administration.xml
index 0c9a60ce2..2a05404f1 100644
--- a/docs/en/xml/administration.xml
+++ b/docs/en/xml/administration.xml
@@ -764,22 +764,6 @@
             </listitem>
           </varlistentry>
 
-          <varlistentry>
-            <term>
-              sendmailnow
-            </term>
-            <listitem>
-              <para>
-                When Bugzilla is using Sendmail older than 8.12, turning this option
-                off will improve performance by not waiting for Sendmail to actually
-                send mail.  If Sendmail 8.12 or later is being used, there is 
-                nothing to gain by turning this off.  If another MTA is being used, 
-                such as Postfix, then this option *must* be turned on (even if you 
-                are using the fake sendmail executable that Postfix provides).
-              </para>
-            </listitem>
-          </varlistentry>
-
           <varlistentry>
             <term>
               whinedays
diff --git a/docs/en/xml/glossary.xml b/docs/en/xml/glossary.xml
index 127b94038..48730b248 100644
--- a/docs/en/xml/glossary.xml
+++ b/docs/en/xml/glossary.xml
@@ -271,8 +271,6 @@
         Perl module, which Bugzilla uses to send email, can be configured to
         use many different underlying implementations for actually sending the
         mail using the <option>mail_delivery_method</option> parameter.
-        Implementations other than <literal>sendmail</literal> require that the
-        <option>sendmailnow</option> param be set to <literal>on</literal>.
         </para>
       </glossdef>
     </glossentry>
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index c35f27f4e..bffcb9b4f 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -1786,13 +1786,8 @@ C:\perl&gt; <command>ppm install &lt;module name&gt;</command>
         <ulink url="http://www.postfix.org/">Postfix</ulink> 
         is used as the built-in email server.  Postfix provides an executable
         that mimics sendmail enough to fool Bugzilla, as long as Bugzilla can 
-        find it.</para>
-
-        <para>As of version 2.20, Bugzilla will be able to find the fake 
-        sendmail executable without any assistance.  However, you will have 
-        to turn on the sendmailnow parameter before you do anything that would 
-        result in email being sent.  For more information, see the description 
-        of the sendmailnow parameter in <xref linkend="parameters"/>.</para>
+        find it. Bugzilla is able to find the fake sendmail executable without
+        any assistance.</para>
 
       </section>
 
diff --git a/template/en/default/admin/params/mta.html.tmpl b/template/en/default/admin/params/mta.html.tmpl
index 8533257f4..872db801a 100644
--- a/template/en/default/admin/params/mta.html.tmpl
+++ b/template/en/default/admin/params/mta.html.tmpl
@@ -55,14 +55,6 @@
     _ " won't get sent). This affects all mail sent by $terms.Bugzilla,"
     _ " not just $terms.bug updates.",
 
-  sendmailnow => "Sites using anything older than version 8.12 of 'sendmail' " _
-                 "can achieve a significant performance increase in the " _
-                 "UI -- at the cost of delaying the sending of mail -- by " _
-                 "disabling this parameter. Sites using 'sendmail' 8.12 or " _
-                 "higher should leave this on, as they will see no benefit from " _
-                 "turning it off. Sites using an MTA other than 'sendmail' " _
-                 "<b>must</b> leave it on, or no $terms.bug mail will be sent.",
-
   smtpserver => "The SMTP server address (if using SMTP for mail delivery).",
 
   smtp_username => "The username to pass to the SMTP server for SMTP authentication. " _
-- 
cgit v1.2.3-24-g4f1b