diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-08 07:05:36 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-08 07:05:36 +0000 |
commit | fd71d468a667a7fd4ebf6f131e4556e5b58095e8 (patch) | |
tree | 41bc0331fe5b574e5154c2301aa8d86ad5d34c40 /lib/net | |
parent | 670140e7cf1547b5337ee0065cbb375e9416c5c6 (diff) |
merge revision(s) 27487:
* lib/net/imap (encode_utf7): encode & properly. Thanks, Kengo
Matsuyama. [ruby-dev:38063] backported from trunk.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
-rw-r--r-- | lib/net/imap.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/net/imap.rb b/lib/net/imap.rb index b42b0d1dea..bfb00e06b6 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -841,7 +841,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]+)/n) { |x| + return s.gsub(/(&)|([^\x20-\x7e]+)/u) { |x| if $1 "&-" else |