summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-06-25 23:38:28 +0000
committerGo MAEDA <maeda@farend.jp>2019-06-25 23:38:28 +0000
commit6b2fe85b74af26b5f9eda7d3b8b6a4591f63ab92 (patch)
treedb119c02e9d981e14d52c58274d87dc4f4704798 /extra
parentb72fd8b19e3770d9f7620ecda435a9c3dc192dfd (diff)
downloadredmine-6b2fe85b74af26b5f9eda7d3b8b6a4591f63ab92.tar.gz
redmine-6b2fe85b74af26b5f9eda7d3b8b6a4591f63ab92.zip
LF line terminators cause misparse of a multi-part email when rdm-mailhandler.rb is invoked from /etc/aliases (#31549).
Patch by Yuichi HARADA. git-svn-id: http://svn.redmine.org/redmine/trunk@18317 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'extra')
-rw-r--r--extra/mail_handler/rdm-mailhandler.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/mail_handler/rdm-mailhandler.rb b/extra/mail_handler/rdm-mailhandler.rb
index 51a0a5afb..b7284841d 100644
--- a/extra/mail_handler/rdm-mailhandler.rb
+++ b/extra/mail_handler/rdm-mailhandler.rb
@@ -153,7 +153,7 @@ END_DESC
headers = { 'User-Agent' => "Redmine mail handler/#{VERSION}" }
- data = { 'key' => key, 'email' => email,
+ data = { 'key' => key, 'email' => email.gsub(/(?<!\r)\n|\r(?!\n)/, "\r\n"),
'allow_override' => allow_override,
'unknown_user' => unknown_user,
'default_group' => default_group,