ruby.git/ext/json/parser, branch ruby_2_0_0

merge revision(s) r44514: [Backport #9374]

2014-02-16T16:16:51+00:00

	* ext/json/generator/depend: add build dependencies for json extension
	  [Bug #9374] [ruby-core:59609]

	* ext/json/parser/depend: ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) 39208:

2013-02-13T06:34:48+00:00

	* ext/json: merge JSON 1.7.7.
	  This includes security fix. [CVE-2013-0269]
	  https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2
	  https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/json: merge JSON 1.7.5.

2012-12-12T10:51:49+00:00

  fix tests and other fixes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

fix dependency

2012-08-31T04:58:18+00:00

* ext/json/parser/depend: fix dependency for error that rb_float_new
  is not found.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36859 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/json: Merge JSON 1.7.1.

2012-05-07T16:00:49+00:00

  https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Revert r35560.

2012-05-07T08:46:50+00:00

This breaks tests:
http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120507T070102Z.log.html.gz

And don't change local codes, contribute it to upstream:
https://github.com/flori/json

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/json/parser/depend: need to specify the base directory for nmake.

2012-05-07T08:25:02+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ext/json/fbuffer/fbuffer.h

2012-05-07T05:11:45+00:00

* ext/json/fbuffer/fbuffer.h: comment-out unused functions.

* ext/json/parser/depend: add dependency.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/json: Merge 164a75c8bd2007d32c4d7665d53140d8fc126dcd.

2012-03-11T13:36:06+00:00

  [ruby-core:41917] [Bug #5846]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/json/parser/parser.rl (json_string_unescape): workaround fix

2012-01-15T06:52:36+00:00

  for over optimization of GCC 4.7. [ruby-core:42085] [Bug #5888]
  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51862

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e