From 77730f7c9dc2e28e7f3c84ce647b84eb470dd819 Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Sat, 5 Apr 2008 11:28:15 +0000 Subject: [PATCH] Avoid modifying the sendmail_settings hash when using the return path. Closes #7572 [billkirtley] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9228 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/lib/action_mailer/base.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 0bb7c6c98e12e..8a4f34447c2e6 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -603,8 +603,9 @@ def perform_delivery_smtp(mail) end def perform_delivery_sendmail(mail) - sendmail_settings[:arguments] += " -f \"#{mail['return-path']}\"" if mail['return-path'] - IO.popen("#{sendmail_settings[:location]} #{sendmail_settings[:arguments]}","w+") do |sm| + sendmail_args = sendmail_settings[:arguments] + sendmail_args += " -f \"#{mail['return-path']}\"" if mail['return-path'] + IO.popen("#{sendmail_settings[:location]} #{sendmail_args}","w+") do |sm| sm.print(mail.encoded.gsub(/\r/, '')) sm.flush end