diff options
| author | Josh Peek <josh@joshpeek.com> | 2008-03-29 21:48:08 +0000 |
|---|---|---|
| committer | Josh Peek <josh@joshpeek.com> | 2008-03-29 21:48:08 +0000 |
| commit | eece9b4e8a9b46a909af424538c4cc55d78b0142 (patch) | |
| tree | bfe3472659ab54c95a29c492c19abffb01545e24 | |
| parent | 6ef3bc3d02de0edcc55085f0010d27e517ebd839 (diff) | |
| download | rails-eece9b4e8a9b46a909af424538c4cc55d78b0142.tar.gz rails-eece9b4e8a9b46a909af424538c4cc55d78b0142.tar.bz2 rails-eece9b4e8a9b46a909af424538c4cc55d78b0142.zip | |
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
| -rw-r--r-- | activesupport/lib/active_support/json/encoders/string.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/json/encoders/string.rb b/activesupport/lib/active_support/json/encoders/string.rb index 28f1190662..20ca91f9aa 100644 --- a/activesupport/lib/active_support/json/encoders/string.rb +++ b/activesupport/lib/active_support/json/encoders/string.rb @@ -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\&') |