diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-03-31 05:31:47 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-03-31 05:31:47 +0000 |
| commit | a8ac5300e657f523fd27c54283b3fd27fb1afdd8 (patch) | |
| tree | ac5b8a76de17813a3bc5c5d677c0497a3674f1d8 /actionmailer/lib | |
| parent | af74077544302d8d6a52ea2ec674da3ea53a29c5 (diff) | |
| download | rails-a8ac5300e657f523fd27c54283b3fd27fb1afdd8.tar.gz rails-a8ac5300e657f523fd27c54283b3fd27fb1afdd8.tar.bz2 rails-a8ac5300e657f523fd27c54283b3fd27fb1afdd8.zip | |
Bump bundled tmail to r242
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9166 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib')
3 files changed, 10 insertions, 10 deletions
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/scanner_r.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/scanner_r.rb index e7eb8641fc..f2075502d8 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/scanner_r.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/scanner_r.rb @@ -1,4 +1,3 @@ -# # scanner_r.rb # #-- @@ -33,7 +32,7 @@ module TMail class TMailScanner - Version = '0.11.0' + Version = '1.2.3' Version.freeze MIME_HEADERS = { @@ -49,9 +48,9 @@ module TMail tokenchars = alnum + Regexp.quote(tokensyms) iso2022str = '\e(?!\(B)..(?:[^\e]+|\e(?!\(B)..)*\e\(B' - eucstr = '(?:[\xa1-\xfe][\xa1-\xfe])+' - sjisstr = '(?:[\x81-\x9f\xe0-\xef][\x40-\x7e\x80-\xfc])+' - utf8str = '(?:[\xc0-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf][\x80-\xbf])+' + eucstr = "(?:[\xa1-\xfe][\xa1-\xfe])+" + sjisstr = "(?:[\x81-\x9f\xe0-\xef][\x40-\x7e\x80-\xfc])+" + utf8str = "(?:[\xc0-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf][\x80-\xbf])+" quoted_with_iso2022 = /\A(?:[^\\\e"]+|#{iso2022str})+/n domlit_with_iso2022 = /\A(?:[^\\\e\]]+|#{iso2022str})+/n diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/stringio.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/stringio.rb index 3817850f63..8357398788 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/stringio.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/stringio.rb @@ -1,3 +1,4 @@ +# encoding: utf-8 =begin rdoc = String handling class diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/utils.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/utils.rb index b18451d017..9a3afe8985 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/utils.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/utils.rb @@ -109,15 +109,15 @@ module TMail # It also provides methods you can call to determine if a string is safe module TextUtils - aspecial = '()<>[]:;.\\,"' - tspecial = '()<>[];:\\,"/?=' - lwsp = " \t\r\n" - control = '\x00-\x1f\x7f-\xff' + aspecial = %Q|()<>[]:;.\\,"| + tspecial = %Q|()<>[];:\\,"/?=| + lwsp = %Q| \t\r\n| + control = %Q|\x00-\x1f\x7f-\xff| + CONTROL_CHAR = /[#{control}]/n ATOM_UNSAFE = /[#{Regexp.quote aspecial}#{control}#{lwsp}]/n PHRASE_UNSAFE = /[#{Regexp.quote aspecial}#{control}]/n TOKEN_UNSAFE = /[#{Regexp.quote tspecial}#{control}#{lwsp}]/n - CONTROL_CHAR = /[#{control}]/n # Returns true if the string supplied is free from characters not allowed as an ATOM def atom_safe?( str ) |