diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-10 14:38:23 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-10 14:38:23 -0300 |
| commit | 4b57bc0c2aaaadfc72f8714b8cd2c88d7e9a7587 (patch) | |
| tree | 884886bf2f48e43053f45ec54c32fb8c0240820d /activesupport/CHANGELOG.md | |
| parent | 9a43816928f07c4ed988fb47545d219eff55e28a (diff) | |
| parent | 582b44175b627e3578fe71e1d452c429022da636 (diff) | |
| download | rails-4b57bc0c2aaaadfc72f8714b8cd2c88d7e9a7587.tar.gz rails-4b57bc0c2aaaadfc72f8714b8cd2c88d7e9a7587.tar.bz2 rails-4b57bc0c2aaaadfc72f8714b8cd2c88d7e9a7587.zip | |
Merge pull request #10534 from cmaruz/master
Escape of U+2028 and U+2029 in the JSON Encoder
Conflicts:
activesupport/lib/active_support/json/encoding.rb
Diffstat (limited to 'activesupport/CHANGELOG.md')
| -rw-r--r-- | activesupport/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 2e04b17e78..27d4d54afa 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,9 @@ +* Added escaping of U+2028 and U+2029 inside the json encoder. + These characters are legal in JSON but break the Javascript interpreter. + After escaping them, the JSON is still legal and can be parsed by Javascript. + + *Mario Caropreso* + * Fix skipping object callbacks using metadata fetched via callback chain inspection methods (`_*_callbacks`) |