diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-12 03:05:45 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-12 03:05:45 +0000 |
| commit | 062d2ee6f798205c3046730d0d348cfd0d0bc09d (patch) | |
| tree | 8be6c2e72c796c481906978565bc116661e4fe9a /test/json/test_json_encoding.rb | |
| parent | f1194eb9b08b7c7be39e168c1f9620e377bee472 (diff) | |
| download | ruby-062d2ee6f798205c3046730d0d348cfd0d0bc09d.tar.gz | |
* 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/trunk@39208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/json/test_json_encoding.rb')
| -rw-r--r-- | test/json/test_json_encoding.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/json/test_json_encoding.rb b/test/json/test_json_encoding.rb index caa0c6c50e..fa7d878920 100644 --- a/test/json/test_json_encoding.rb +++ b/test/json/test_json_encoding.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# -*- coding: utf-8 -*- +# encoding: utf-8 require 'test/unit' require File.join(File.dirname(__FILE__), 'setup_variant') |