ruby.git/ext/json, branch v2_0_0_451 The Ruby Programming Language merge revision(s) r45076: [Backport #9535] 2014-02-22T02:49:01+00:00 nagachika nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2014-02-22T02:49:01+00:00 8c6dd375a7fc4da62b49475bce5ea5a64105e5cd * class.c (rb_mod_init_copy): do nothing if copying self. [ruby-dev:47989] [Bug #9535] * hash.c (rb_hash_initialize_copy): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
	* class.c (rb_mod_init_copy): do nothing if copying self.
	  [ruby-dev:47989] [Bug #9535]

	* hash.c (rb_hash_initialize_copy): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) r44514: [Backport #9374] 2014-02-16T16:16:51+00:00 nagachika nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2014-02-16T16:16:51+00:00 bdcadb8c440f16e132d34addfa83fb4d956cb48d * 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 
	* 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) 44569:44572,44576:44579,44581,44590:44594,44607,44608,44614,44615: 2014-01-19T16:28:53+00:00 nagachika nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2014-01-19T16:28:53+00:00 8302aa5f951e85984899d73fafa6bef2f23deddd iseq.c: linear search * iseq.c (iseq_type_from_id): linear search instead of hash lookup for small fixed number keys. ------------------------------------------------------------------------ r44570 | nobu | 2014-01-12 17:11:32 +0900 (Sun, 12 Jan 2014) | 4 lines tcltklib.c: create_ip_exc format argument * ext/tk/tcltklib.c (create_ip_exc): format argument must not be a dynamic string, not to contain unescaped %. ------------------------------------------------------------------------ r44571 | nobu | 2014-01-12 17:11:34 +0900 (Sun, 12 Jan 2014) | 5 lines stubs.c: library name strings * ext/tk/stubs.c (ruby_open_tcl_dll, ruby_open_tk_dll): make library names by string literal concatenation at compilation time, not by sprintf() at runtime. ------------------------------------------------------------------------ r44572 | nobu | 2014-01-12 17:11:36 +0900 (Sun, 12 Jan 2014) | 1 line ext: use rb_sprintf() and rb_vsprintf() with PRIsVALUE * ext/bigdecimal/bigdecimal.c (CLASS_NAME): macro to wrap depending on PRIsVALUE for 1.9. [Backport #9406] * ext/bigdecimal/bigdecimal.c (DECIMAL_SIZE_OF_BITS): fallback definition for 2.1 or older. [ruby-core:59750] [Backport #9406] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
	iseq.c: linear search

	* iseq.c (iseq_type_from_id): linear search instead of hash lookup for
  small fixed number keys.
	------------------------------------------------------------------------
	r44570 | nobu | 2014-01-12 17:11:32 +0900 (Sun, 12 Jan 2014) | 4 lines

	tcltklib.c: create_ip_exc format argument

	* ext/tk/tcltklib.c (create_ip_exc): format argument must not be a
  dynamic string, not to contain unescaped %.
	------------------------------------------------------------------------
	r44571 | nobu | 2014-01-12 17:11:34 +0900 (Sun, 12 Jan 2014) | 5 lines

	stubs.c: library name strings

	* ext/tk/stubs.c (ruby_open_tcl_dll, ruby_open_tk_dll): make library
  names by string literal concatenation at compilation time, not by
  sprintf() at runtime.
	------------------------------------------------------------------------
	r44572 | nobu | 2014-01-12 17:11:36 +0900 (Sun, 12 Jan 2014) | 1 line

	ext: use rb_sprintf() and rb_vsprintf() with PRIsVALUE
	* ext/bigdecimal/bigdecimal.c (CLASS_NAME): macro to wrap
	  depending on PRIsVALUE for 1.9.  [Backport #9406]

	* ext/bigdecimal/bigdecimal.c (DECIMAL_SIZE_OF_BITS): fallback
	  definition for 2.1 or older.  [ruby-core:59750] [Backport #9406]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 41862: 2013-07-13T14:36:33+00:00 nagachika nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2013-07-13T14:36:33+00:00 ce75312a67dc2bbb0f721c4759447fcd48a4d814 fixup stying of `Json#generate` parameter docs by @daveworth [fixes GH-339] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
	fixup stying of `Json#generate` parameter docs by @daveworth [fixes GH-339]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39208: 2013-02-13T06:34:48+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2013-02-13T06:34:48+00:00 b7b9aa6609b0f49c1f7d2935e5a1e3a13223957e * 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.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/lib/json.rb: Move module overview definition for rdoc 2013-02-04T19:39:15+00:00 zzak zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2013-02-04T19:39:15+00:00 53bc349069de17584e20aeef601b407d5ef74794 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: merge JSON 1.7.5. 2012-12-12T10:51:49+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2012-12-12T10:51:49+00:00 43f6fdfb42d3f4c9025c290bdf5aeffe5959f1bf fix tests and other fixes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
  fix tests and other fixes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
depend: dependency 2012-10-03T07:33:24+00:00 nobu nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2012-10-03T07:33:24+00:00 396903d3842fbae6c2bc5d2d72eb734516a88f3a * ext/json/generator/depend: fix missing dependency. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
* ext/json/generator/depend: fix missing dependency.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
fix dependency 2012-08-31T04:58:18+00:00 nobu nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2012-08-31T04:58:18+00:00 30fbd739a19cadb4b7c63ca1f982891a69ff17a8 * 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/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
avoid compilation error on AIX by -ansi -std=iso9899:199409 (r36038). [ruby-core:46744] [Bug #6791]. 2012-07-25T22:26:41+00:00 kanemoto kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2012-07-25T22:26:41+00:00 48cb94779364a5f0e81fba0a702845a0ba5815d6 This issue is fixed in upper stream as issue #142. (https://github.com/flori/json/issues/142) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
This issue is fixed in upper stream as issue #142. (https://github.com/flori/json/issues/142)



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