@@ -603,8 +603,9 @@ module ActionMailer #:nodoc: 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 actionmailer/lib/action_mailer/base.rb 097c0d61660aeee598900b1e748332f24eaec68e Michael Koziarski michael@koziarski.com http://github.com/foca/rails/commit/77730f7c9dc2e28e7f3c84ce647b84eb470dd819 77730f7c9dc2e28e7f3c84ce647b84eb470dd819 2008-04-05T04:28:15-07:00 2008-04-05T04:28:15-07:00 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 5acf80e4a228ebd2d3209bfe8221454f43348049 Michael Koziarski michael@koziarski.com