nobu	2011-02-06 13:48:49 +0900 (Sun, 06 Feb 2011)

  New Revision: 30807

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30807

  Log:
    * ext/json/lib/json/common.rb (JSON::MissingUnicodeSupport.iconv):
      should not drop rest of the result.  use Iconv.conv instead.

  Modified files:
    trunk/ChangeLog
    trunk/ext/json/lib/json/common.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30806)
+++ ChangeLog	(revision 30807)
@@ -1,3 +1,8 @@
+Sun Feb  6 13:48:29 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@s...>
 
 	* string.c (gsub): Ensure result encoding is the same as input
Index: ext/json/lib/json/common.rb
===================================================================
--- ext/json/lib/json/common.rb	(revision 30806)
+++ ext/json/lib/json/common.rb	(revision 30807)
@@ -348,7 +348,7 @@
   else
     require 'iconv'
     def self.iconv(to, from, string)
-      Iconv.iconv(to, from, string).first
+      Iconv.conv(to, from, string)
     end
   end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/