diff options
| author | Adam Kocoloski <adam@cloudant.com> | 2011-11-09 11:19:37 -0800 |
|---|---|---|
| committer | Adam Kocoloski <adam@cloudant.com> | 2011-11-09 11:19:37 -0800 |
| commit | 0b2c8fb248a8d8671f30e8111ca5188113eb2c93 (patch) | |
| tree | 4b102373cc25ca231f3d027c4e5a5f0f03e35ef6 | |
| parent | 4216ca260c305ea3b39b2a45a8dd2e6d5cdb529f (diff) | |
| parent | 6ad4258c2f2ca158ae311931d348941e74f01b89 (diff) | |
Merge pull request #80 from cloudant/12833-conditional_json_encode
| -rw-r--r-- | apps/couch/src/couch_rep.erl | 3 | ||||
| -rw-r--r-- | apps/couch/src/couch_rep_changes_feed.erl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/couch/src/couch_rep.erl b/apps/couch/src/couch_rep.erl index 8f2508f5..82b69bc9 100644 --- a/apps/couch/src/couch_rep.erl +++ b/apps/couch/src/couch_rep.erl @@ -834,7 +834,8 @@ ensure_full_commit(#http_db{headers = Headers} = Source, RequiredSeq) -> Req = Source#http_db{ resource = "_ensure_full_commit", method = post, - qs = [{seq, iolist_to_binary(?JSON_ENCODE(RequiredSeq))}], + qs = [{seq, case RequiredSeq of Bin when is_binary(Bin) -> Bin; + Else -> iolist_to_binary(?JSON_ENCODE(Else)) end}], headers = Headers1 }, {ResultProps} = couch_rep_httpc:request(Req), diff --git a/apps/couch/src/couch_rep_changes_feed.erl b/apps/couch/src/couch_rep_changes_feed.erl index 70db52a0..651069fb 100644 --- a/apps/couch/src/couch_rep_changes_feed.erl +++ b/apps/couch/src/couch_rep_changes_feed.erl @@ -64,7 +64,8 @@ init([Parent, #http_db{headers = Headers0} = Source, Since, PostProps]) -> BaseQS = [ {"style", all_docs}, {"heartbeat", 10000}, - {"since", iolist_to_binary(?JSON_ENCODE(Since))}, + {"since", case Since of Bin when is_binary(Bin) -> Bin; + Else -> iolist_to_binary(?JSON_ENCODE(Else)) end}, {"feed", Feed} ], {QS, Method, Body, Headers} = case get_value(<<"doc_ids">>, PostProps) of |