couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikewall...@apache.org
Subject couch-replicator commit: updated refs/heads/master to fc49a36
Date Tue, 01 Mar 2016 18:13:26 GMT
Repository: couchdb-couch-replicator
Updated Branches:
  refs/heads/master ff49e1c47 -> fc49a366c


Do not crash in couch_replicator:terminate/2 if a local dbname is used.

Even though local source or target database names are not valid
for replication in CouchDB 2.0, do not crash when trying to
strip credentials. Replicator process has to terminate properly
in order to report the error in the replication document for
user feedback.

JIRA: COUCHDB-2949

This closes #28

Signed-off-by: Mike Wallace <mikewallace@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/fc49a366
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/fc49a366
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/fc49a366

Branch: refs/heads/master
Commit: fc49a366cb51522bc2be8c2aa022cd9636528c9c
Parents: ff49e1c
Author: Nick Vatamaniuc <vatamane@gmail.com>
Authored: Mon Feb 29 18:45:58 2016 -0500
Committer: Mike Wallace <mikewallace@apache.org>
Committed: Tue Mar 1 18:05:58 2016 +0000

----------------------------------------------------------------------
 src/couch_replicator.erl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/fc49a366/src/couch_replicator.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator.erl b/src/couch_replicator.erl
index d6e9e39..e5beb25 100644
--- a/src/couch_replicator.erl
+++ b/src/couch_replicator.erl
@@ -519,7 +519,9 @@ httpdb_strip_creds(#httpdb{url = Url, headers = Headers} = HttpDb) ->
     HttpDb#httpdb{
         url = couch_util:url_strip_password(Url),
         headers = headers_strip_creds(Headers, [])
-    }.
+    };
+httpdb_strip_creds(LocalDb) ->
+    LocalDb.
 
 
 rep_strip_creds(#rep{source = Source, target = Target} = Rep) ->


Mime
View raw message