mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/json: Update to JSON 1.4.2.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
97cfd1869c
commit
dc22009c26
3 changed files with 6 additions and 2 deletions
|
@ -1,3 +1,7 @@
|
|||
Wed Apr 28 23:21:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* ext/json: Update to JSON 1.4.2.
|
||||
|
||||
Wed Apr 28 22:53:57 2010 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* thread. (rb_thread_terminate_all): revert r24591 which caused SEGV
|
||||
|
|
|
@ -921,7 +921,7 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj, VALUE depth)
|
|||
|
||||
generate_json(buffer, self, state, obj, NIL_P(depth) ? 0 : FIX2INT(depth));
|
||||
result = rb_str_new(FBUFFER_PAIR(buffer));
|
||||
fbuffer_free_only_buffer(buffer);
|
||||
fbuffer_free(buffer);
|
||||
FORCE_UTF8(result);
|
||||
return result;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
module JSON
|
||||
# JSON version
|
||||
VERSION = '1.4.1'
|
||||
VERSION = '1.4.2'
|
||||
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
|
||||
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
|
||||
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
|
||||
|
|
Loading…
Reference in a new issue