naruse
|
062d2ee6f7
|
* ext/json: merge JSON 1.7.7.
This includes security fix. [CVE-2013-0269]
d0a62f3ced
https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2013-02-12 03:05:45 +00:00 |
|
naruse
|
5a00be2bf7
|
* ext/json: Merge JSON 1.7.1.
e5b9a9465c
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2012-05-07 16:00:49 +00:00 |
|
naruse
|
4d8d3184d1
|
* ext/json: Merge 164a75c8bd2007d32c4d7665d53140d8fc126dcd.
[ruby-core:41917] [Bug #5846]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2012-03-11 13:36:06 +00:00 |
|
naruse
|
c358a4cba1
|
* ext/json/parser/parser.rl (json_string_unescape): workaround fix
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
|
2012-01-15 06:52:36 +00:00 |
|
naruse
|
b14c060dda
|
* ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1).
[Bug #5173] [ruby-core:38866]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2011-08-30 02:23:12 +00:00 |
|
naruse
|
a2e497d5ed
|
* ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd).
[Bug #4700]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2011-07-10 08:01:04 +00:00 |
|
nobu
|
29e497d231
|
* ext/json/{generator/generator.c,parser/parser.rl}: fix indent.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2011-07-08 09:00:54 +00:00 |
|
nobu
|
bc1fd9458d
|
* ext/json/parser/parser.rl (JSON_parse_object): add missing parens.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2011-07-08 09:00:51 +00:00 |
|
nobu
|
4902ef7d59
|
* ext/json/parser/parser.rl (convert_encoding): should not modify
the argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2011-07-08 07:40:41 +00:00 |
|
nobu
|
b16fd08622
|
* ext/json/parser/parser.rl (convert_encoding): no needs to use
force_encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2011-07-08 07:39:09 +00:00 |
|
nobu
|
1069e5d665
|
* ext/json/parser/parser.h (GET_PARSER): raise TypeError.
* ext/json/parser/parser.rl (cParser_initialize): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2011-02-05 02:29:18 +00:00 |
|
nobu
|
9cc62abc6b
|
* ext/json/parser/parser.h (GET_PARSER): check if initialized.
[ruby-core:35079]
* ext/json/parser/parser.rl (cParser_initialize): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2011-02-05 01:30:01 +00:00 |
|
nobu
|
bc1e4b4e2a
|
* ext/json/parser/parser.rl: add local variables for emacs.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2011-02-05 01:13:41 +00:00 |
|
naruse
|
4a84c27e3e
|
* ext/json: Update github/flori/json from 1.4.2+ to
e22b2f2bdfe6a9b0. this fixes some bugs.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2010-12-01 16:26:13 +00:00 |
|
nobu
|
5d379991de
|
* ext/json/{generator/generator.c,parser/parser.rl}: fixed indent.
* ext/json/{generator,parser}/depend: added.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2010-05-09 00:30:12 +00:00 |
|
naruse
|
3642494ce5
|
Recommit of JSON; fix mixed declarations.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2010-04-26 06:27:27 +00:00 |
|
usa
|
27be3056dc
|
* ext/jason: revert r27493. came again after canceling gcc-ism.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2010-04-26 04:34:36 +00:00 |
|
naruse
|
54592ad627
|
* ext/json: Update to JSON 1.4.1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
2010-04-26 00:06:35 +00:00 |
|