summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_httpd.erl
diff options
context:
space:
mode:
authorChristopher Lenz <cmlenz@apache.org>2008-05-26 12:47:00 +0000
committerChristopher Lenz <cmlenz@apache.org>2008-05-26 12:47:00 +0000
commit3bbbbf14522cbd95f2a0f6610b8b6af5ebb6c778 (patch)
tree17bba3d6804a5421cd19a5db0f62076feeedd087 /src/couchdb/couch_httpd.erl
parent7409e56fc2cc3c8927153c63959a23d867466967 (diff)
* Respond to DELETE requests with a "200 OK" status code instead of "202 Accepted", as the deletion is performed immediately.
* The "content-type" member in attachment structures is now named "content_type" (underscore) for consistency and to be more accessible from Javascript (and presumably other languages, too) git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@660176 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_httpd.erl')
-rw-r--r--src/couchdb/couch_httpd.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 7174a145..26bb0915 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -164,7 +164,7 @@ handle_db_request(Req, Method, {DbName, Rest}) ->
handle_db_request(Req, 'DELETE', {DbName, _Db, []}) ->
ok = couch_server:delete(DbName),
- send_json(Req, 202, {obj, [
+ send_json(Req, 200, {obj, [
{ok, true}
]});
@@ -451,7 +451,7 @@ handle_doc_request(Req, 'DELETE', _DbName, Db, DocId) ->
throw({bad_request, "Document rev and etag have different values"})
end,
{ok, NewRev} = couch_db:delete_doc(Db, DocId, [RevToDelete]),
- send_json(Req, 202, {obj, [
+ send_json(Req, 200, {obj, [
{ok, true},
{id, DocId},
{rev, NewRev}