diff options
author | Jan Lehnardt <jan@apache.org> | 2010-02-28 02:41:52 +0000 |
---|---|---|
committer | Jan Lehnardt <jan@apache.org> | 2010-02-28 02:41:52 +0000 |
commit | 1be99a1ef26c3d9233483cd7d0e0ff3f96ca8514 (patch) | |
tree | a4268dc90249b6965658cf9def9cb1619c8115e4 /src/couchdb/couch_httpd_show.erl | |
parent | 5a9f96cf2646a0c9db468cd7876e75cdb9fda742 (diff) |
Merge branch 'show-deleted-docs' into trunk
* show-deleted-docs:
treat deleted docs as nonexistant docs
Revert "Avoid replication task crashes by imporoving timeout handling."
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@917098 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_httpd_show.erl')
-rw-r--r-- | src/couchdb/couch_httpd_show.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/couchdb/couch_httpd_show.erl b/src/couchdb/couch_httpd_show.erl index 18f24e85..72c6bae1 100644 --- a/src/couchdb/couch_httpd_show.erl +++ b/src/couchdb/couch_httpd_show.erl @@ -31,6 +31,7 @@ maybe_open_doc(Db, DocId) -> case catch couch_httpd_db:couch_doc_open(Db, DocId, nil, [conflicts]) of {not_found, missing} -> nil; + {not_found,deleted} -> nil; Doc -> Doc end. handle_doc_show_req(#httpd{ |