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

Merge branch 'fix/crash-on-invalid-accept-encoding' of git://github.com/soundrop/cowboy

Browse source
This commit is contained in:
Loïc Hoguin 2013-06-19 15:51:24 +02:00
commit 46376b3524
1 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/cowboy_req.erl
View file

@ -1021,7 +1021,8 @@ reply(Status, Headers, Body, Req=#http_req{
reply_may_compress(Status, Headers, Body, Req, reply_may_compress(Status, Headers, Body, Req,
RespHeaders, HTTP11Headers, Method) -> RespHeaders, HTTP11Headers, Method) ->
BodySize = iolist_size(Body), BodySize = iolist_size(Body),
{ok, Encodings, Req2} = parse_header(<<"accept-encoding">>, Req), case parse_header(<<"accept-encoding">>, Req) of
{ok, Encodings, Req2} ->
CanGzip = (BodySize > 300) CanGzip = (BodySize > 300)
andalso (false =:= lists:keyfind(<<"content-encoding">>, andalso (false =:= lists:keyfind(<<"content-encoding">>,
1, Headers)) 1, Headers))
@ -1048,6 +1049,10 @@ reply_may_compress(Status, Headers, Body, Req,
false -> false ->
reply_no_compress(Status, Headers, Body, Req, reply_no_compress(Status, Headers, Body, Req,
RespHeaders, HTTP11Headers, Method, BodySize) RespHeaders, HTTP11Headers, Method, BodySize)
end;
{error, badarg} ->
reply_no_compress(Status, Headers, Body, Req,
RespHeaders, HTTP11Headers, Method, BodySize)
end. end.
reply_no_compress(Status, Headers, Body, Req, reply_no_compress(Status, Headers, Body, Req,