Skip to content
This repository has been archived by the owner on Oct 22, 2021. It is now read-only.

Commit

Permalink
Conditionally apply JSON encoding to update_seq values
Browse files Browse the repository at this point in the history
BigCouch 0.3 cannot parse requests of the form /db/_changes?since="123-foo" so
the recent ?JSON_ENCODE addition to Since in two places causes 0.3 <-> 0.4
replication to fail with json_encode/badterm errors.

This patch applies JSON encoding only when the Since value is not already a
binary (i.e, when it's a [integer(), binary()]) and interop is restored.

BugzID: 12833
  • Loading branch information
Robert Newson committed Nov 9, 2011
1 parent 4216ca2 commit 6ad4258
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion apps/couch/src/couch_rep.erl
Expand Up @@ -834,7 +834,8 @@ ensure_full_commit(#http_db{headers = Headers} = Source, RequiredSeq) ->
Req = Source#http_db{ Req = Source#http_db{
resource = "_ensure_full_commit", resource = "_ensure_full_commit",
method = post, 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 headers = Headers1
}, },
{ResultProps} = couch_rep_httpc:request(Req), {ResultProps} = couch_rep_httpc:request(Req),
Expand Down
3 changes: 2 additions & 1 deletion apps/couch/src/couch_rep_changes_feed.erl
Expand Up @@ -64,7 +64,8 @@ init([Parent, #http_db{headers = Headers0} = Source, Since, PostProps]) ->
BaseQS = [ BaseQS = [
{"style", all_docs}, {"style", all_docs},
{"heartbeat", 10000}, {"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} {"feed", Feed}
], ],
{QS, Method, Body, Headers} = case get_value(<<"doc_ids">>, PostProps) of {QS, Method, Body, Headers} = case get_value(<<"doc_ids">>, PostProps) of
Expand Down

0 comments on commit 6ad4258

Please sign in to comment.