aboutsummaryrefslogtreecommitdiffstats
path: root/test/http_handler_multipart.erl
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2012-09-16 03:51:07 +0200
committerLoïc Hoguin <[email protected]>2012-09-17 13:56:58 +0200
commit8d5f8db90a10a8ca16f8f17bcb076ff4b93e9c63 (patch)
tree916b1c238ce6dea4652e7b50341c37128ba633b2 /test/http_handler_multipart.erl
parente13ab806eaadd40c72145b5783c7727f2ed88d14 (diff)
downloadcowboy-8d5f8db90a10a8ca16f8f17bcb076ff4b93e9c63.tar.gz
cowboy-8d5f8db90a10a8ca16f8f17bcb076ff4b93e9c63.tar.bz2
cowboy-8d5f8db90a10a8ca16f8f17bcb076ff4b93e9c63.zip
Improve consistency of return types for cowboy_req API
The signature of parse_header, body_qs, multipart_data and the set_resp_* functions has changed. See the cowboy_req module edoc for more details.
Diffstat (limited to 'test/http_handler_multipart.erl')
-rw-r--r--test/http_handler_multipart.erl22
1 files changed, 11 insertions, 11 deletions
diff --git a/test/http_handler_multipart.erl b/test/http_handler_multipart.erl
index ad5d27e..850574f 100644
--- a/test/http_handler_multipart.erl
+++ b/test/http_handler_multipart.erl
@@ -8,22 +8,22 @@ init({_Transport, http}, Req, []) ->
{ok, Req, {}}.
handle(Req, State) ->
- {Result, Req2} = acc_multipart(Req, []),
+ {Result, Req2} = acc_multipart(Req),
{ok, Req3} = cowboy_req:reply(200, [], term_to_binary(Result), Req2),
{ok, Req3, State}.
terminate(_Req, _State) ->
ok.
-acc_multipart(Req, Acc) ->
- {Result, Req2} = cowboy_req:multipart_data(Req),
- acc_multipart(Req2, Acc, Result).
+acc_multipart(Req) ->
+ acc_multipart(cowboy_req:multipart_data(Req), []).
-acc_multipart(Req, Acc, {headers, Headers}) ->
- acc_multipart(Req, [{Headers, []}|Acc]);
-acc_multipart(Req, [{Headers, BodyAcc}|Acc], {body, Data}) ->
- acc_multipart(Req, [{Headers, [Data|BodyAcc]}|Acc]);
-acc_multipart(Req, [{Headers, BodyAcc}|Acc], end_of_part) ->
- acc_multipart(Req, [{Headers, list_to_binary(lists:reverse(BodyAcc))}|Acc]);
-acc_multipart(Req, Acc, eof) ->
+acc_multipart({headers, Headers, Req}, Acc) ->
+ acc_multipart(cowboy_req:multipart_data(Req), [{Headers, []}|Acc]);
+acc_multipart({body, Data, Req}, [{Headers, BodyAcc}|Acc]) ->
+ acc_multipart(cowboy_req:multipart_data(Req), [{Headers, [Data|BodyAcc]}|Acc]);
+acc_multipart({end_of_part, Req}, [{Headers, BodyAcc}|Acc]) ->
+ acc_multipart(cowboy_req:multipart_data(Req),
+ [{Headers, list_to_binary(lists:reverse(BodyAcc))}|Acc]);
+acc_multipart({eof, Req}, Acc) ->
{lists:reverse(Acc), Req}.