summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/couchdb/couch_httpd.erl2
-rw-r--r--src/couchdb/couch_httpd_db.erl6
2 files changed, 8 insertions, 0 deletions
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 5e150055..5775e3a7 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -417,6 +417,8 @@ error_info({unauthorized, Msg}) ->
error_info(file_exists) ->
{412, <<"file_exists">>, <<"The database could not be "
"created, the file already exists.">>};
+error_info({bad_ctype, Reason}) ->
+ {415, <<"bad_content_type">>, Reason};
error_info({Error, Reason}) ->
{500, couch_util:to_binary(Error), couch_util:to_binary(Reason)};
error_info(Error) ->
diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl
index bacce4ae..f8eed81f 100644
--- a/src/couchdb/couch_httpd_db.erl
+++ b/src/couchdb/couch_httpd_db.erl
@@ -497,6 +497,12 @@ db_doc_req(#httpd{method='GET'}=Req, Db, DocId) ->
end;
db_doc_req(#httpd{method='POST'}=Req, Db, DocId) ->
+ case couch_httpd:header_value(Req, "content-type") of
+ "multipart/form-data" ++ _Rest ->
+ ok;
+ _Else ->
+ throw({bad_ctype, <<"Invalid Content-Type header for form upload">>})
+ end,
Form = couch_httpd:parse_form(Req),
Rev = couch_doc:parse_rev(list_to_binary(proplists:get_value("_rev", Form))),
{ok, [{ok, Doc}]} = couch_db:open_doc_revs(Db, DocId, [Rev], []),