Merge the diff for send_error/2 and send_error/4
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/d38f6e96 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/tree/d38f6e96 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/diff/d38f6e96 Branch: refs/heads/split_out_httpd_stack Commit: d38f6e961862ec05e653bb97ac52f7164d9c5a39 Parents: 8e0b3f4 Author: ILYA Khlopotov <iil...@ca.ibm.com> Authored: Fri Feb 26 10:11:17 2016 -0800 Committer: ILYA Khlopotov <iil...@ca.ibm.com> Committed: Tue Mar 1 08:35:08 2016 -0800 ---------------------------------------------------------------------- src/couch_httpd_original.erl | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/d38f6e96/src/couch_httpd_original.erl ---------------------------------------------------------------------- diff --git a/src/couch_httpd_original.erl b/src/couch_httpd_original.erl index 47ead0d..877b963 100644 --- a/src/couch_httpd_original.erl +++ b/src/couch_httpd_original.erl @@ -19,7 +19,7 @@ -export([make_fun_spec_strs/1]). --export([send_error/2,send_error/4, send_chunked_error/2]). +-export([send_chunked_error/2]). -export([handle_request_int/5]). @@ -73,7 +73,9 @@ validate_referer/1, validate_bind_address/1, verify_is_server_admin/1, - error_info/1 + error_info/1, + send_error/2, + send_error/4 ]). -define(HANDLER_NAME_IN_MODULE_POS, 6). @@ -473,23 +475,6 @@ error_headers(#httpd{mochi_req=MochiReq}=Req, Code, ErrorStr, ReasonStr) -> {Code, []} end. -send_error(_Req, {already_sent, Resp, _Error}) -> - {ok, Resp}; - -send_error(Req, Error) -> - {Code, ErrorStr, ReasonStr} = error_info(Error), - {Code1, Headers} = error_headers(Req, Code, ErrorStr, ReasonStr), - send_error(Req, Code1, Headers, ErrorStr, ReasonStr). - -send_error(Req, Code, ErrorStr, ReasonStr) -> - send_error(Req, Code, [], ErrorStr, ReasonStr). - -send_error(Req, Code, Headers, ErrorStr, ReasonStr) -> - send_json(Req, Code, Headers, - {[{<<"error">>, ErrorStr}, - {<<"reason">>, ReasonStr}]}). - - send_chunked_error(Resp, Error) -> {Code, ErrorStr, ReasonStr} = error_info(Error), JsonError = {[{<<"code">>, Code},
