umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

handle escaped solidus correctly per JSON spec

Browse source
This commit is contained in:
Bob Ippolito 2012-04-26 13:04:17 -07:00
parent 9dd596b95b
commit 6ff1471550
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.markdown
View file

@ -109,7 +109,7 @@ json text input and json strings SHOULD be utf8 encoded binaries, appropriately
#### `escaped_forward_slashes` #### #### `escaped_forward_slashes` ####
json strings are escaped according to the json spec. this means forward slashes are never escaped. unfortunately, a microsoft implementation of json uses escaped forward slashes in json formatted date strings. without this option it is impossible to get date strings that some microsoft tools understand json strings are escaped according to the json spec. this means forward slashes (solidus) are optionally escaped. this option is only relevant for encoding, you may want to use this if you are embedding JSON directly into a HTML or XML document. See: [html4-non-html-data]
#### `single_quoted_strings` #### #### `single_quoted_strings` ####
@ -343,4 +343,4 @@ jsx wouldn't be what it is without the contributions of paul davis, lloyd hilaie
[MIT]: http://www.opensource.org/licenses/mit-license.html [MIT]: http://www.opensource.org/licenses/mit-license.html
[rebar]: https://github.com/basho/rebar [rebar]: https://github.com/basho/rebar
[meck]: https://github.com/eproxus/meck [meck]: https://github.com/eproxus/meck
[rfc4627]: http://tools.ietf.org/html/rfc4627 [rfc4627]: http://tools.ietf.org/html/rfc4627[html4-non-html-data]: http://www.w3.org/TR/html4/appendix/notes.html#h-B.3.2

2
src/jsx_decoder.erl
View file

@ -600,7 +600,7 @@ escape(<<$t, Rest/binary>>, Handler, [Acc|Stack], Opts) ->
string(Rest, Handler, [?acc_seq(Acc, maybe_replace($\t, Opts))|Stack], Opts); string(Rest, Handler, [?acc_seq(Acc, maybe_replace($\t, Opts))|Stack], Opts);
escape(<<?rsolidus, Rest/binary>>, Handler, [Acc|Stack], Opts) -> escape(<<?rsolidus, Rest/binary>>, Handler, [Acc|Stack], Opts) ->
string(Rest, Handler, [?acc_seq(Acc, maybe_replace($\\, Opts))|Stack], Opts); string(Rest, Handler, [?acc_seq(Acc, maybe_replace($\\, Opts))|Stack], Opts);
escape(<<?solidus, Rest/binary>>, Handler, [Acc|Stack], Opts=#opts{escaped_forward_slashes=true}) -> escape(<<?solidus, Rest/binary>>, Handler, [Acc|Stack], Opts) ->
string(Rest, Handler, [?acc_seq(Acc, maybe_replace($/, Opts))|Stack], Opts); string(Rest, Handler, [?acc_seq(Acc, maybe_replace($/, Opts))|Stack], Opts);
escape(<<?doublequote, Rest/binary>>, Handler, [Acc|Stack], Opts) -> escape(<<?doublequote, Rest/binary>>, Handler, [Acc|Stack], Opts) ->
string(Rest, Handler, [?acc_seq(Acc, maybe_replace($\", Opts))|Stack], Opts); string(Rest, Handler, [?acc_seq(Acc, maybe_replace($\", Opts))|Stack], Opts);