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

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

ChangeLog

@@ -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>
 
 	* string.c (gsub): Ensure result encoding is the same as input

ext/json/lib/json/common.rb

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