diff options
| author | Christopher Lenz <cmlenz@apache.org> | 2008-04-15 12:21:00 +0000 |
|---|---|---|
| committer | Christopher Lenz <cmlenz@apache.org> | 2008-04-15 12:21:00 +0000 |
| commit | 39de3072bcf9fdeec6d3faeb125924c401242205 (patch) | |
| tree | da55307c8762f9ff16f7a7e478d971c0f352d281 /src/couchdb/cjson.erl | |
| parent | 53968ddfd93bfe1aa403478de715ae0ac77db177 (diff) | |
Merged mochiweb branch back into trunk.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@648222 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/cjson.erl')
| -rw-r--r-- | src/couchdb/cjson.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/couchdb/cjson.erl b/src/couchdb/cjson.erl index 042d5c41..6e144c9e 100644 --- a/src/couchdb/cjson.erl +++ b/src/couchdb/cjson.erl @@ -410,7 +410,7 @@ tokenize([], S=#decoder{state=trim}) -> tokenize([L | Rest], S) when is_list(L) -> tokenize(L ++ Rest, S); tokenize([B | Rest], S) when is_binary(B) -> - tokenize(xmerl_ucs:from_utf8(B) ++ Rest, S); + tokenize(xmerl_ucs:from_utf8(B) ++ Rest, S#decoder{input_encoding=unicode}); tokenize("\r\n" ++ Rest, S) -> tokenize(Rest, ?INC_LINE(S)); tokenize("\n" ++ Rest, S) -> |