aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-17 09:27:02 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-17 09:27:02 +0000
commitbb62568cc36399ba1b6f5d6e9db9f7a71072ad1b (patch)
tree5ff643e81aa480cf90f9e76e289d6719a5267d6b /actionmailer/lib
parente69924ecdc23558158af952a4a11cb4b5080f4b5 (diff)
downloadrails-bb62568cc36399ba1b6f5d6e9db9f7a71072ad1b.tar.gz
rails-bb62568cc36399ba1b6f5d6e9db9f7a71072ad1b.tar.bz2
rails-bb62568cc36399ba1b6f5d6e9db9f7a71072ad1b.zip
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]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1849 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
1 files changed, 1 insertions, 1 deletions
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