From 062d2ee6f798205c3046730d0d348cfd0d0bc09d Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 12 Feb 2013 03:05:45 +0000
Subject: * 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
---
 test/json/test_json_fixtures.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/json/test_json_fixtures.rb')

diff --git a/test/json/test_json_fixtures.rb b/test/json/test_json_fixtures.rb
index 37e51457d4..584dffdfdb 100755
--- a/test/json/test_json_fixtures.rb
+++ b/test/json/test_json_fixtures.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')
-- 
cgit v1.2.3