ruby.git/test/json, branch ruby_2_0_0

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

revert r37326 "remove string literal concatenation"

2012-10-25T14:06:31+00:00

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

remove string literal concatenation

2012-10-25T10:07:22+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37326 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

Run TC_JSONGenerate#test_gc in a separate process.

2012-04-19T03:21:23+00:00

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

Add debug prints to inspect TC_JSONGenerate#test_gc's timeout issue.

2012-04-15T07:37:45+00:00

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

Adds another timeouts.

2012-04-14T18:56:12+00:00

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

More increae timeout.

2012-04-10T11:56:09+00:00

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

Increae timeout.

2012-04-10T09:23:14+00:00

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