1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Force json string encoding to ASCII-8BIT before unpacking for Ruby 1.9.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9138 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Josh Peek 2008-03-29 21:48:08 +00:00
parent 6ef3bc3d02
commit eece9b4e8a

View file

@ -19,9 +19,11 @@ end
class String
def to_json(options = nil) #:nodoc:
'"' + gsub(/[\010\f\n\r\t"\\><&]/) { |s|
json = '"' + gsub(/[\010\f\n\r\t"\\><&]/) { |s|
ActiveSupport::JSON::Encoding::ESCAPED_CHARS[s]
}.gsub(/([\xC0-\xDF][\x80-\xBF]|
}
json.force_encoding('ascii-8bit') if respond_to?(:force_encoding)
json.gsub(/([\xC0-\xDF][\x80-\xBF]|
[\xE0-\xEF][\x80-\xBF]{2}|
[\xF0-\xF7][\x80-\xBF]{3})+/nx) { |s|
s.unpack("U*").pack("n*").unpack("H*")[0].gsub(/.{4}/, '\\\\u\&')