summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/www/script/test/basics.js4
-rw-r--r--src/couchdb/couch_httpd_db.erl2
2 files changed, 6 insertions, 0 deletions
diff --git a/share/www/script/test/basics.js b/share/www/script/test/basics.js
index 2837b77a..06c73ddf 100644
--- a/share/www/script/test/basics.js
+++ b/share/www/script/test/basics.js
@@ -141,4 +141,8 @@ couchTests.basics = function(debug) {
var locs = loc.split('/');
T(locs[4] == resp.id);
T(locs[3] == "test_suite_db");
+
+ // deleting a non-existent doc should be 404
+ xhr = CouchDB.request("DELETE", "/test_suite_db/doc-does-not-exist");
+ T(xhr.status == 404);
};
diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl
index 03fbb001..2bfc2940 100644
--- a/src/couchdb/couch_httpd_db.erl
+++ b/src/couchdb/couch_httpd_db.erl
@@ -423,6 +423,8 @@ all_docs_view(Req, Db, Keys) ->
db_doc_req(#httpd{method='DELETE'}=Req, Db, DocId) ->
+ % check for the existence of the doc to handle the 404 case.
+ couch_doc_open(Db, DocId, nil, []),
case couch_httpd:qs_value(Req, "rev") of
undefined ->
update_doc(Req, Db, DocId, {[{<<"_deleted">>,true}]});