1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/json/lib/json/common.rb (JSON::MissingUnicodeSupport.iconv):

Browse Source 
should not drop rest of the result.  use Iconv.conv instead.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-02-06 04:48:49 +00:00
parent edaf78dfb6
commit b5f628a84a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Feb 6 13:48:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/json/lib/json/common.rb (JSON::MissingUnicodeSupport.iconv):
should not drop rest of the result. use Iconv.conv instead.
Sun Feb 6 12:46:02 2011 Eric Hodel <drbrain@segment7.net> Sun Feb 6 12:46:02 2011 Eric Hodel <drbrain@segment7.net>
* string.c (gsub): Ensure result encoding is the same as input * string.c (gsub): Ensure result encoding is the same as input

2
ext/json/lib/json/common.rb
View File

@ -348,7 +348,7 @@ module JSON
else else
require 'iconv' require 'iconv'
def self.iconv(to, from, string) def self.iconv(to, from, string)
Iconv.iconv(to, from, string).first Iconv.conv(to, from, string)
end end
end end
end end