Use default content-type application/json Some requests made by the replicator were missing a Content-Type header. By default now all requests have a Content-Type of application/json.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/55d2c9e3 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/55d2c9e3 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/55d2c9e3 Branch: refs/heads/COUCHDB-1342 Commit: 55d2c9e390cf06a76ff6715a60b85f8f4ca26f97 Parents: a2d57c8 Author: Filipe David Borba Manana <fdman...@apache.org> Authored: Sat Jan 7 14:02:36 2012 +0000 Committer: Filipe David Borba Manana <fdman...@apache.org> Committed: Sat Jan 7 14:02:36 2012 +0000 ---------------------------------------------------------------------- .../src/couch_replicator_api_wrap.erl | 7 ++----- .../src/couch_replicator_api_wrap.hrl | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/55d2c9e3/src/couch_replicator/src/couch_replicator_api_wrap.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator/src/couch_replicator_api_wrap.erl b/src/couch_replicator/src/couch_replicator_api_wrap.erl index d287fcb..c3bcdab 100644 --- a/src/couch_replicator/src/couch_replicator_api_wrap.erl +++ b/src/couch_replicator/src/couch_replicator_api_wrap.erl @@ -121,8 +121,7 @@ get_db_info(#db{name = DbName, user_ctx = UserCtx}) -> ensure_full_commit(#httpdb{} = Db) -> send_req( Db, - [{method, post}, {path, "_ensure_full_commit"}, - {headers, [{"Content-Type", "application/json"}]}], + [{method, post}, {path, "_ensure_full_commit"}], fun(201, _, {Props}) -> {ok, get_value(<<"instance_start_time">>, Props)}; (_, _, {Props}) -> @@ -287,7 +286,6 @@ update_docs(#httpdb{} = HttpDb, DocList, Options, UpdateType) -> end, Headers = [ {"Content-Length", Len}, - {"Content-Type", "application/json"}, {"X-Couch-Full-Commit", FullCommit} ], send_req( @@ -322,9 +320,8 @@ changes_since(#httpdb{headers = Headers1} = HttpDb, Style, StartSeq, QArgs1 = maybe_add_changes_filter_q_args(BaseQArgs, Options), {QArgs1, get, [], Headers1}; _ when is_list(DocIds) -> - Headers2 = [{"Content-Type", "application/json"} | Headers1], JsonDocIds = ?JSON_ENCODE({[{<<"doc_ids">>, DocIds}]}), - {[{"filter", "_doc_ids"} | BaseQArgs], post, JsonDocIds, Headers2} + {[{"filter", "_doc_ids"} | BaseQArgs], post, JsonDocIds, Headers1} end, send_req( HttpDb, http://git-wip-us.apache.org/repos/asf/couchdb/blob/55d2c9e3/src/couch_replicator/src/couch_replicator_api_wrap.hrl ---------------------------------------------------------------------- diff --git a/src/couch_replicator/src/couch_replicator_api_wrap.hrl b/src/couch_replicator/src/couch_replicator_api_wrap.hrl index 1a6f27a..8dd594a 100644 --- a/src/couch_replicator/src/couch_replicator_api_wrap.hrl +++ b/src/couch_replicator/src/couch_replicator_api_wrap.hrl @@ -17,6 +17,7 @@ oauth = nil, headers = [ {"Accept", "application/json"}, + {"Content-Type", "application/json"}, {"User-Agent", "CouchDB/" ++ couch_server:get_version()} ], timeout, % milliseconds