diff options
author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-14 04:00:09 +0000 |
---|---|---|
committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-14 04:00:09 +0000 |
commit | 2587316c7370a666fb94e7100176533ae38990c1 (patch) | |
tree | 2d895d27c4894d73d8782ff6187658b801b94748 | |
parent | ddafeb2f2a66a25b0d024ab764b519795afa5383 (diff) |
* lib/net/imap (encode_utf7): encode & properly. Thanks, Kengo
Matsuyama. [ruby-dev:38063]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/net/imap.rb | 2 | ||||
-rw-r--r-- | test/net/imap/test_imap.rb | 4 |
3 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Apr 14 12:56:21 2010 Shugo Maeda <shugo@ruby-lang.org> + + * lib/net/imap (encode_utf7): encode & properly. Thanks, Kengo + Matsuyama. [ruby-dev:38063] + Wed Apr 14 11:39:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/syck/lib/syck/basenode.rb (Syck::BaseNode#match_path): fixed diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 980fed61ca..6f1a578144 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -911,7 +911,7 @@ module Net # Encode a string from UTF-8 format to modified UTF-7. def self.encode_utf7(s) - return s.gsub(/(&)|([^\x20-\x25\x27-\x7e]+)/u) { + return s.gsub(/(&)|([^\x20-\x7e]+)/u) { if $1 "&-" else diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb index b7714dff1a..501298cdc4 100644 --- a/test/net/imap/test_imap.rb +++ b/test/net/imap/test_imap.rb @@ -19,6 +19,10 @@ class IMAPTest < Test::Unit::TestCase utf8 = "\357\274\241\357\274\242\357\274\243".force_encoding("UTF-8") s = Net::IMAP.encode_utf7(utf8) assert_equal("&,yH,Iv8j-".force_encoding("UTF-8"), s) + + utf8 = "\343\201\202&".force_encoding("UTF-8") + s = Net::IMAP.encode_utf7(utf8) + assert_equal("&MEI-&-".force_encoding("UTF-8"), s) end def test_decode_utf7 |