diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2010-10-16 12:52:47 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2010-10-16 12:52:47 +0000 |
| commit | d48a657b344be6a19d8fa57a7564ea8ac8c89421 (patch) | |
| tree | 9eb77b44b56e81222010e36b750bb97500bd1982 /src/couchdb/couch_rep.erl | |
| parent | 9c562724956541ce2122e944bed943f49989014a (diff) | |
Replicator: fix issues when a peer is accessible via SSL.
Closes COUCHDB-491.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1023274 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_rep.erl')
| -rw-r--r-- | src/couchdb/couch_rep.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/couchdb/couch_rep.erl b/src/couchdb/couch_rep.erl index 3e029421..a507f81e 100644 --- a/src/couchdb/couch_rep.erl +++ b/src/couchdb/couch_rep.erl @@ -608,7 +608,10 @@ open_db({Props}, _UserCtx, ProxyParams, CreateTarget) -> auth = AuthProps, headers = lists:ukeymerge(1, Headers, DefaultHeaders) }, - Db = Db1#http_db{options = Db1#http_db.options ++ ProxyParams}, + Db = Db1#http_db{ + options = Db1#http_db.options ++ ProxyParams ++ + couch_rep_httpc:ssl_options(Db1) + }, couch_rep_httpc:db_exists(Db, CreateTarget); open_db(<<"http://",_/binary>>=Url, _, ProxyParams, CreateTarget) -> open_db({[{<<"url">>,Url}]}, [], ProxyParams, CreateTarget); |