Merge pull request #24436 from arktisklada/matching-sendmail-default-arguments

Sendmail default arguments match Mail::SendMail

actionmailer/CHANGELOG.md

@@ -1,3 +1,9 @@
+*   Removes `-t` from default Sendmail arguments to match the underlying
+    `Mail::Sendmail` setting.
+
+    *Clayton Liggitt*
+
+
 ## Rails 5.0.0.beta3 (February 24, 2016) ##
 
 *   Add support for fragment caching in Action Mailer views.

actionmailer/lib/action_mailer/delivery_methods.rb

@@ -36,7 +36,7 @@ module ActionMailer
 
       add_delivery_method :sendmail, Mail::Sendmail,
         location:  '/usr/sbin/sendmail',
-        arguments: '-i -t'
+        arguments: '-i'
 
       add_delivery_method :test, Mail::TestMailer
     end

actionmailer/test/delivery_methods_test.rb

@@ -39,7 +39,7 @@ class DefaultsDeliveryMethodsTest < ActiveSupport::TestCase
   test "default sendmail settings" do
     settings = {
       location:  '/usr/sbin/sendmail',
-      arguments: '-i -t'
+      arguments: '-i'
     }
     assert_equal settings, ActionMailer::Base.sendmail_settings
   end