From 39de3072bcf9fdeec6d3faeb125924c401242205 Mon Sep 17 00:00:00 2001
From: Christopher Lenz <cmlenz@apache.org>
Date: Tue, 15 Apr 2008 12:21:00 +0000
Subject: Merged mochiweb branch back into trunk.

git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@648222 13f79535-47bb-0310-9956-ffa450edef68
---
 src/couchdb/cjson.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/couchdb/cjson.erl')

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) ->
-- 
cgit v1.2.3