summaryrefslogtreecommitdiff
path: root/NEWS
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-13 06:34:48 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-13 06:34:48 +0000
commitb7b9aa6609b0f49c1f7d2935e5a1e3a13223957e (patch)
tree0e574d1901db92231cf972eedb82e0eb20e1cce3 /NEWS
parent88cc04cf424fd02bf3111beb4ee419e541ee6ba2 (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 'NEWS')
-rw-r--r--NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 45097b4611..1514318542 100644
--- a/NEWS
+++ b/NEWS
@@ -229,6 +229,9 @@ with all sufficient information, see the ChangeLog file.
* added IO#wait_writable method.
* added IO#wait_readable method as alias of IO#wait.
+* json
+ * updated to 1.7.7.
+
* net/http
* new features:
* Proxies are now automatically detected from the http_proxy environment