diff options
| -rw-r--r-- | actionmailer/CHANGELOG | 5 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 28730a9152..4643de02b1 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,3 +1,8 @@ +*SVN* + +* Fix problem with sendmail delivery where headers should be delimited by \n characters instead of \r\n, which confuses some mail readers #1742 [Kent Sibilev] + + *1.0.1* (11 July, 2005) * Bind to Action Pack 1.9.1 diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index b26c11b44b..f09255b229 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -326,7 +326,7 @@ module ActionMailer #:nodoc: def perform_delivery_sendmail(mail) IO.popen("/usr/sbin/sendmail -i -t","w+") do |sm| - sm.print(mail.encoded) + sm.print(mail.encoded.gsub(/\r/, '')) sm.flush end end |