From 2587316c7370a666fb94e7100176533ae38990c1 Mon Sep 17 00:00:00 2001 From: shugo Date: Wed, 14 Apr 2010 04:00:09 +0000 Subject: * 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 --- ChangeLog | 5 +++++ lib/net/imap.rb | 2 +- test/net/imap/test_imap.rb | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c9a3ca78c9..ccd728c1db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Apr 14 12:56:21 2010 Shugo Maeda + + * lib/net/imap (encode_utf7): encode & properly. Thanks, Kengo + Matsuyama. [ruby-dev:38063] + Wed Apr 14 11:39:26 2010 Nobuyoshi Nakada * 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 -- cgit v1.2.3