umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-16 13:10:24 +00:00
Code Issues Wiki Activity

Merge branch 'multipart' of https://github.com/nox/cowboy

Browse source 
Conflicts:
	src/cowboy_http_req.erl
	test/http_SUITE.erl
This commit is contained in:
Loïc Hoguin 2012-01-23 07:23:44 +01:00
commit b650ef8907
7 changed files with 376 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/cowboy_http_protocol.erl
View file

@ -380,7 +380,10 @@ ensure_body_processed(Req=#http_req{body_state=waiting}) ->
{error, badarg} -> ok; %% No body.
{error, _Reason} -> close;
_Any -> ok
end.
end;
ensure_body_processed(Req=#http_req{body_state={multipart, _, _}}) ->
{ok, Req2} = cowboy_http_req:multipart_skip(Req),
ensure_body_processed(Req2).
-spec ensure_response(#http_req{}) -> ok.
%% The handler has already fully replied to the client.