couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iil...@apache.org
Subject [18/50] couch-httpd commit: updated refs/heads/split_out_httpd_stack to e44a372
Date Tue, 01 Mar 2016 20:00:51 GMT
Merge the diff for error_info/1


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/commit/8e0b3f4b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/tree/8e0b3f4b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/diff/8e0b3f4b

Branch: refs/heads/split_out_httpd_stack
Commit: 8e0b3f4b41f008890b921c89919ff7d6257cc02e
Parents: d2c5f48
Author: ILYA Khlopotov <iilyak@ca.ibm.com>
Authored: Fri Feb 26 10:06:30 2016 -0800
Committer: ILYA Khlopotov <iilyak@ca.ibm.com>
Committed: Tue Mar 1 08:35:08 2016 -0800

----------------------------------------------------------------------
 src/couch_httpd.erl          |  3 +++
 src/couch_httpd_original.erl | 54 ++-------------------------------------
 2 files changed, 5 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/8e0b3f4b/src/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd.erl b/src/couch_httpd.erl
index ea91405..321fbd3 100644
--- a/src/couch_httpd.erl
+++ b/src/couch_httpd.erl
@@ -702,6 +702,9 @@ error_info(not_implemented) ->
 error_info(timeout) ->
     {500, <<"timeout">>, <<"The request could not be processed in a reasonable"
         " amount of time.">>};
+% Prior art for md5 mismatch resulting in a 400 is from AWS S3
+error_info(md5_mismatch) ->
+    {400, <<"content_md5_mismatch">>, <<"Possible message corruption.">>};
 error_info({timeout, _Reason}) ->
     error_info(timeout);
 error_info({Error, null}) ->

http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/8e0b3f4b/src/couch_httpd_original.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd_original.erl b/src/couch_httpd_original.erl
index 98b334e..47ead0d 100644
--- a/src/couch_httpd_original.erl
+++ b/src/couch_httpd_original.erl
@@ -16,7 +16,6 @@
 -export([start_link/0, start_link/1, stop/0, handle_request/5]).
 
 
--export([error_info/1]).
 -export([make_fun_spec_strs/1]).
 
 
@@ -73,7 +72,8 @@
     accepted_encodings/1,
     validate_referer/1,
     validate_bind_address/1,
-    verify_is_server_admin/1
+    verify_is_server_admin/1,
+    error_info/1
 ]).
 
 -define(HANDLER_NAME_IN_MODULE_POS, 6).
@@ -415,56 +415,6 @@ increment_method_stats(Method) ->
 % Utilities
 
 
-
-
-error_info({Error, Reason}) when is_list(Reason) ->
-    error_info({Error, ?l2b(Reason)});
-error_info(bad_request) ->
-    {400, <<"bad_request">>, <<>>};
-error_info({bad_request, Reason}) ->
-    {400, <<"bad_request">>, Reason};
-error_info({query_parse_error, Reason}) ->
-    {400, <<"query_parse_error">>, Reason};
-% Prior art for md5 mismatch resulting in a 400 is from AWS S3
-error_info(md5_mismatch) ->
-    {400, <<"content_md5_mismatch">>, <<"Possible message corruption.">>};
-error_info({illegal_docid, Reason}) ->
-    {400, <<"illegal_docid">>, Reason};
-error_info(not_found) ->
-    {404, <<"not_found">>, <<"missing">>};
-error_info({not_found, Reason}) ->
-    {404, <<"not_found">>, Reason};
-error_info({not_acceptable, Reason}) ->
-    {406, <<"not_acceptable">>, Reason};
-error_info(conflict) ->
-    {409, <<"conflict">>, <<"Document update conflict.">>};
-error_info({forbidden, Msg}) ->
-    {403, <<"forbidden">>, Msg};
-error_info({unauthorized, Msg}) ->
-    {401, <<"unauthorized">>, Msg};
-error_info(file_exists) ->
-    {412, <<"file_exists">>, <<"The database could not be "
-        "created, the file already exists.">>};
-error_info(request_entity_too_large) ->
-    {413, <<"too_large">>, <<"the request entity is too large">>};
-error_info(request_uri_too_long) ->
-    {414, <<"too_long">>, <<"the request uri is too long">>};
-error_info({bad_ctype, Reason}) ->
-    {415, <<"bad_content_type">>, Reason};
-error_info(requested_range_not_satisfiable) ->
-    {416, <<"requested_range_not_satisfiable">>, <<"Requested range not
satisfiable">>};
-error_info({error, {illegal_database_name, Name}}) ->
-    Message = <<"Name: '", Name/binary, "'. Only lowercase characters (a-z), ",
-        "digits (0-9), and any of the characters _, $, (, ), +, -, and / ",
-        "are allowed. Must begin with a letter.">>,
-    {400, <<"illegal_database_name">>, Message};
-error_info({missing_stub, Reason}) ->
-    {412, <<"missing_stub">>, Reason};
-error_info({Error, Reason}) ->
-    {500, couch_util:to_binary(Error), couch_util:to_binary(Reason)};
-error_info(Error) ->
-    {500, <<"unknown_error">>, couch_util:to_binary(Error)}.
-
 error_headers(#httpd{mochi_req=MochiReq}=Req, Code, ErrorStr, ReasonStr) ->
     if Code == 401 ->
         % this is where the basic auth popup is triggered


Mime
View raw message