diff options
| author | John Christopher Anderson <jchris@apache.org> | 2008-11-09 22:39:26 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2008-11-09 22:39:26 +0000 |
| commit | 538f455f2e2842d5caa33ed300d28b3cd52599b3 (patch) | |
| tree | 4c467c3fafd2205dcc28da6a91aecf30e2f2415c | |
| parent | 51f186c86a46fcbd7815b09367df8e22b9b1bbb2 (diff) | |
apply replication fixing patches from COUCHDB-157
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@712578 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | share/www/script/couch_tests.js | 11 | ||||
| -rw-r--r-- | src/couchdb/couch_rep.erl | 2 |
3 files changed, 13 insertions, 1 deletions
@@ -14,6 +14,7 @@ Some of these people are: * Michael Gottesman <gottesmm@reed.edu> * Michael Hendricks <michael@ndrix.org> * Till Klampaeckel <till@klampaeckel.de> + * Adam Kocoloski <adam.kocoloski@gmail.com> * Roger Leigh <rleigh@debian.org> * Jim Lindley <web@jimlindley.com> * Sam Ruby <rubys@intertwingly.net> diff --git a/share/www/script/couch_tests.js b/share/www/script/couch_tests.js index ccb9755d..2553df9b 100644 --- a/share/www/script/couch_tests.js +++ b/share/www/script/couch_tests.js @@ -1615,6 +1615,17 @@ var tests = { T(docA._rev == docB._rev); } + // check documents with a '/' in the ID + // need to re-encode the slash when replicating from a remote source + dbA.save({ _id:"abc/def", val:"one" }); + + T(CouchDB.replicate(A, B).ok); + T(CouchDB.replicate(B, A).ok); + + docA = dbA.open("abc/def"); + docB = dbB.open("abc/def"); + T(docA._rev == docB._rev); + // now check binary attachments var binDoc = { _id:"bin_doc", diff --git a/src/couchdb/couch_rep.erl b/src/couchdb/couch_rep.erl index 2eb59ddb..c91364c8 100644 --- a/src/couchdb/couch_rep.erl +++ b/src/couchdb/couch_rep.erl @@ -343,7 +343,7 @@ open_doc_revs(DbUrl, DocId, Revs, Options) when is_list(DbUrl) -> "latest=true" end, Options), RevsQueryStrs = lists:flatten(?JSON_ENCODE(Revs)), - Url = DbUrl ++ binary_to_list(DocId) ++ "?" ++ couch_util:implode(["revs=true", "attachments=true", "open_revs=" ++ RevsQueryStrs ] ++ QueryOptionStrs, "&"), + Url = DbUrl ++ url_encode(DocId) ++ "?" ++ couch_util:implode(["revs=true", "attachments=true", "open_revs=" ++ RevsQueryStrs ] ++ QueryOptionStrs, "&"), JsonResults = do_http_request(Url, get, []), Results = lists:map( |