diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2010-09-10 01:26:01 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2010-09-10 01:26:01 +0000 |
| commit | ce44c0efd3a79843e5504c32c1147bd2c64d0331 (patch) | |
| tree | 1d16bb721e94b4fd318566d72d36ee6891da6359 /src/couchdb/couch_rep_httpc.erl | |
| parent | f2827a1208dd612558bd036c4f8244eb747f3c25 (diff) | |
Merged revision 995631 from trunk:
Bug fix: replicator proxy option ignored.
Thanks James Jackson for finding and reporting the bug.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@995632 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_rep_httpc.erl')
| -rw-r--r-- | src/couchdb/couch_rep_httpc.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/couchdb/couch_rep_httpc.erl b/src/couchdb/couch_rep_httpc.erl index ff25e4d5..886babd1 100644 --- a/src/couchdb/couch_rep_httpc.erl +++ b/src/couchdb/couch_rep_httpc.erl @@ -72,6 +72,7 @@ db_exists(Req, CanonicalUrl, CreateDB) -> #http_db{ auth = Auth, headers = Headers0, + options = Options, url = Url } = Req, HeadersFun = fun(Method) -> @@ -84,10 +85,10 @@ db_exists(Req, CanonicalUrl, CreateDB) -> end, case CreateDB of true -> - catch ibrowse:send_req(Url, HeadersFun(put), put); + catch ibrowse:send_req(Url, HeadersFun(put), put, [], Options); _Else -> ok end, - case catch ibrowse:send_req(Url, HeadersFun(head), head) of + case catch ibrowse:send_req(Url, HeadersFun(head), head, [], Options) of {ok, "200", _, _} -> Req#http_db{url = CanonicalUrl}; {ok, "301", RespHeaders, _} -> |