diff options
| author | Paul J. Davis <paul.joseph.davis@gmail.com> | 2017-10-30 16:47:06 -0500 |
|---|---|---|
| committer | Joan Touzet <wohali@users.noreply.github.com> | 2017-10-31 22:52:10 -0400 |
| commit | e01f3009b59a00d81dd1f6d4e807afab08b2d072 (patch) | |
| tree | ff8296cf837edd14ec08827b405c718b57c2dd63 | |
| parent | b5d98788510dabf22651df9f00b3af0d3abaee81 (diff) | |
| download | couchdb-e01f3009b59a00d81dd1f6d4e807afab08b2d072.tar.gz | |
Update jiffy to use dedupe_keys
| -rw-r--r-- | rebar.config.script | 2 | ||||
| -rw-r--r-- | src/couch/src/couch_util.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rebar.config.script b/rebar.config.script index ee63aef13..cdd80e4c3 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -62,7 +62,7 @@ DepDescs = [ %% Third party deps {folsom, "folsom", {tag, "CouchDB-0.8.2"}}, {ibrowse, "ibrowse", {tag, "CouchDB-4.0.1"}}, -{jiffy, "jiffy", {tag, "CouchDB-0.14.11-1"}}, +{jiffy, "jiffy", {tag, "CouchDB-0.14.11-2"}}, {mochiweb, "mochiweb", {tag, "CouchDB-2.12.0-1"}}, {meck, "meck", {tag, "0.8.8"}} diff --git a/src/couch/src/couch_util.erl b/src/couch/src/couch_util.erl index 4d3d73d66..b8a0b623b 100644 --- a/src/couch/src/couch_util.erl +++ b/src/couch/src/couch_util.erl @@ -426,7 +426,7 @@ json_encode(V) -> json_decode(V) -> try - jiffy:decode(V) + jiffy:decode(V, [dedupe_keys]) catch throw:Error -> throw({invalid_json, Error}) |