aboutsummaryrefslogtreecommitdiffstats
path: root/test/http_SUITE_data/http_multipart.erl
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-02-06 19:36:25 +0100
committerLoïc Hoguin <[email protected]>2014-02-06 19:36:25 +0100
commit917cf99e10c41676183d501b86af6e47c95afb89 (patch)
tree4f8877626baaea0a749b8007aab1838aa372aecb /test/http_SUITE_data/http_multipart.erl
parent1f5342f3b8ce40b7bee0b9e8ff76981be6aea2df (diff)
downloadcowboy-917cf99e10c41676183d501b86af6e47c95afb89.tar.gz
cowboy-917cf99e10c41676183d501b86af6e47c95afb89.tar.bz2
cowboy-917cf99e10c41676183d501b86af6e47c95afb89.zip
Add and document the new multipart code
The old undocumented API is removed entirely. While a documentation exists for the new API, it will not be considered set in stone until further testing has been performed, and a file upload example has been added. The new API should be a little more efficient than the old API, especially with smaller messages.
Diffstat (limited to 'test/http_SUITE_data/http_multipart.erl')
-rw-r--r--test/http_SUITE_data/http_multipart.erl22
1 files changed, 9 insertions, 13 deletions
diff --git a/test/http_SUITE_data/http_multipart.erl b/test/http_SUITE_data/http_multipart.erl
index c94739f..79bfeb8 100644
--- a/test/http_SUITE_data/http_multipart.erl
+++ b/test/http_SUITE_data/http_multipart.erl
@@ -8,22 +8,18 @@ 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(_, _, _) ->
ok.
-acc_multipart(Req) ->
- acc_multipart(cowboy_req:multipart_data(Req), []).
-
-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}.
+acc_multipart(Req, Acc) ->
+ case cowboy_req:part(Req) of
+ {ok, Headers, Req2} ->
+ {ok, Body, Req3} = cowboy_req:part_body(Req2),
+ acc_multipart(Req3, [{Headers, Body}|Acc]);
+ {done, Req2} ->
+ {lists:reverse(Acc), Req2}
+ end.