aboutsummaryrefslogtreecommitdiffstats
path: root/src/cowboy_http_req.erl
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2012-05-05 07:11:05 +0200
committerLoïc Hoguin <[email protected]>2012-05-05 07:11:05 +0200
commit5ffeb9e7e9befdd7a06465c4b51c619c62fa7175 (patch)
tree4ed91aeda9d93dce6ffa30457b50564f62df7fea /src/cowboy_http_req.erl
parent376d5372e1fd7e92cde44a0d6551216ad1060e59 (diff)
parentd495582029c8b3e911f20be9f2a229eb1b8a2902 (diff)
downloadcowboy-5ffeb9e7e9befdd7a06465c4b51c619c62fa7175.tar.gz
cowboy-5ffeb9e7e9befdd7a06465c4b51c619c62fa7175.tar.bz2
cowboy-5ffeb9e7e9befdd7a06465c4b51c619c62fa7175.zip
Merge branch 'patch-1' of https://github.com/yrashk/cowboy
Diffstat (limited to 'src/cowboy_http_req.erl')
-rw-r--r--src/cowboy_http_req.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cowboy_http_req.erl b/src/cowboy_http_req.erl
index f25c5eb..e8fd43a 100644
--- a/src/cowboy_http_req.erl
+++ b/src/cowboy_http_req.erl
@@ -563,14 +563,14 @@ body_qs(Req=#http_req{urldecode={URLDecFun, URLDecArg}}) ->
%%
%% Use this function for multipart streaming. For each part in the request,
%% this function returns <em>{headers, Headers}</em> followed by a sequence of
-%% <em>{data, Data}</em> tuples and finally <em>end_of_part</em>. When there
+%% <em>{body, Data}</em> tuples and finally <em>end_of_part</em>. When there
%% is no part to parse anymore, <em>eof</em> is returned.
%%
%% If the request Content-Type is not a multipart one, <em>{error, badarg}</em>
%% is returned.
-spec multipart_data(#http_req{})
-> {{headers, cowboy_http:headers()}
- | {data, binary()} | end_of_part | eof,
+ | {body, binary()} | end_of_part | eof,
#http_req{}}.
multipart_data(Req=#http_req{body_state=waiting}) ->
{{<<"multipart">>, _SubType, Params}, Req2} =