diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-06-22 09:59:14 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-06-22 09:59:14 +0000 |
| commit | 996fa1526dd238a12e1f6173090d8bcbbfd567d2 (patch) | |
| tree | cb2885d50afa3aa7a640dcb89e42d55457d349d1 /actionmailer/lib | |
| parent | 1d4d721782dd1d89435f79261b954eb0f163b312 (diff) | |
| download | rails-996fa1526dd238a12e1f6173090d8bcbbfd567d2.tar.gz rails-996fa1526dd238a12e1f6173090d8bcbbfd567d2.tar.bz2 rails-996fa1526dd238a12e1f6173090d8bcbbfd567d2.zip | |
Unquoted @ chars in received email headers are parsed properly in spite of RFC 822 (#1206)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1476 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib')
| -rwxr-xr-x | actionmailer/lib/action_mailer/vendor/tmail/scanner_r.rb | 4 | ||||
| -rwxr-xr-x | actionmailer/lib/action_mailer/vendor/tmail/utils.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/scanner_r.rb b/actionmailer/lib/action_mailer/vendor/tmail/scanner_r.rb index fb90f9b5e9..7722c75336 100755 --- a/actionmailer/lib/action_mailer/vendor/tmail/scanner_r.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/scanner_r.rb @@ -25,8 +25,8 @@ module TMail } alnum = 'a-zA-Z0-9' - atomsyms = %q[ _#!$%&`'*+-{|}~^/=? ].strip - tokensyms = %q[ _#!$%&`'*+-{|}~^. ].strip + atomsyms = %q[ _#!$%&`'*+-{|}~^@/=? ].strip + tokensyms = %q[ _#!$%&`'*+-{|}~^@. ].strip atomchars = alnum + Regexp.quote(atomsyms) tokenchars = alnum + Regexp.quote(tokensyms) diff --git a/actionmailer/lib/action_mailer/vendor/tmail/utils.rb b/actionmailer/lib/action_mailer/vendor/tmail/utils.rb index 57919473f1..5dc1f812e5 100755 --- a/actionmailer/lib/action_mailer/vendor/tmail/utils.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/utils.rb @@ -36,8 +36,8 @@ module TMail module TextUtils - aspecial = '()<>[]:;.@\\,"' - tspecial = '()<>[];:@\\,"/?=' + aspecial = '()<>[]:;.\\,"' + tspecial = '()<>[];:\\,"/?=' lwsp = " \t\r\n" control = '\x00-\x1f\x7f-\xff' |