merb-core/lib/merb-core/core_ext/json_pure_fix.rb merb-core/spec/public/core_ext/json_pure_spec.rb @@ -418,6 +418,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader rescue LoadError gem "json_pure" require "json/pure" + require "merb-core/core_ext/json_pure_fix" end # Resets the logger and sets the log_stream to Merb::Config[:log_file] merb-core/lib/merb-core/bootloader.rb @@ -14,12 +14,6 @@ require 'kconv' require 'rack' require 'fileutils' -begin - require 'json' -rescue - require 'json/pure' -end - Merb::Dispatcher module Merb merb-core/lib/merb-core/test/run_specs.rb ffff732093da6d300b4652616a8fa150ec758331 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/merb/commit/c5b38d2f5244fe45d0d9ef29cb321e35c7751df0 c5b38d2f5244fe45d0d9ef29cb321e35c7751df0 2009-06-30T09:59:44-07:00 2009-06-29T17:30:40-07:00 Patch security vulnerability in json_pure 1.1.6. 19d2db0eb2a47c532d2defc177b4c75a74535b56 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com