Permalink
Browse files

Fixed that a return-path header would be ignored (closes #7572) [joost]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9099 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent f5b991d commit 5c0d38f6749e91c9847f6a4d56264d83253b3539 @dhh dhh committed Mar 27, 2008
Showing with 10 additions and 2 deletions.
  1. +2 −0 actionmailer/CHANGELOG
  2. +8 −2 actionmailer/lib/action_mailer/base.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that a return-path header would be ignored #7572 [joost]
+
* Less verbose mail logging: just recipients for :info log level; the whole email for :debug only. #8000 [iaddict, Tarmo Tänav]
* Updated TMail to version 1.2.1 [raasdnil]
@@ -40,10 +40,14 @@ module ActionMailer #:nodoc:
# * <tt>content_type</tt> - Specify the content type of the message. Defaults to <tt>text/plain</tt>.
# * <tt>headers</tt> - Specify additional headers to be set for the message, e.g. <tt>headers 'X-Mail-Count' => 107370</tt>.
#
+ # When a <tt>headers 'return-path'</tt> is specified, that value will be used as the 'envelope from'
+ # address. Setting this is useful when you want delivery notifications sent to a different address than
+ # the one in <tt>from</tt>.
+ #
# The <tt>body</tt> method has special behavior. It takes a hash which generates an instance variable
# named after each key in the hash containing the value that that key points to.
#
- # So, for example, <tt>body "account" => recipient</tt> would result
+ # So, for example, <tt>body :account => recipient</tt> would result
# in an instance variable <tt>@account</tt> with the value of <tt>recipient</tt> being accessible in the
# view.
#
@@ -590,14 +594,16 @@ def create_mail
def perform_delivery_smtp(mail)
destinations = mail.destinations
mail.ready_to_send
+ sender = mail['return-path'] || mail.from
Net::SMTP.start(smtp_settings[:address], smtp_settings[:port], smtp_settings[:domain],
smtp_settings[:user_name], smtp_settings[:password], smtp_settings[:authentication]) do |smtp|
- smtp.sendmail(mail.encoded, mail.from, destinations)
+ smtp.sendmail(mail.encoded, sender, destinations)
end
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|
sm.print(mail.encoded.gsub(/\r/, ''))
sm.flush

0 comments on commit 5c0d38f

Please sign in to comment.