diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-13 06:34:48 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-13 06:34:48 +0000 |
| commit | b7b9aa6609b0f49c1f7d2935e5a1e3a13223957e (patch) | |
| tree | 0e574d1901db92231cf972eedb82e0eb20e1cce3 /ChangeLog | |
| parent | 88cc04cf424fd02bf3111beb4ee419e541ee6ba2 (diff) | |
merge revision(s) 39208:
* 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
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Wed Feb 13 15:34:21 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * 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 + Sat Feb 9 21:13:35 2013 Kazuki Tsujimoto <kazuki@callcc.net> * backport r39167 from trunk. [ruby-core:52059] [Bug #7812] |