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

Fix connection state being ignored for unknown length streaming

Browse source
This commit is contained in:
Loïc Hoguin 2013-02-12 17:15:11 +01:00
parent 75b8849b47
commit 20329a6e9e
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/cowboy_req.erl
View file

@ -911,7 +911,6 @@ reply(Status, Headers, Body, Req=#http_req{
version=Version, connection=Connection, version=Version, connection=Connection,
method=Method, resp_compress=Compress, method=Method, resp_compress=Compress,
resp_state=waiting, resp_headers=RespHeaders}) -> resp_state=waiting, resp_headers=RespHeaders}) ->
RespConn = response_connection(Headers, Connection),
HTTP11Headers = case Version of HTTP11Headers = case Version of
{1, 1} -> [{<<"connection">>, atom_to_connection(Connection)}]; {1, 1} -> [{<<"connection">>, atom_to_connection(Connection)}];
_ -> [] _ -> []
@ -919,18 +918,20 @@ reply(Status, Headers, Body, Req=#http_req{
case Body of case Body of
BodyFun when is_function(BodyFun) -> BodyFun when is_function(BodyFun) ->
%% We stream the response body until we close the connection. %% We stream the response body until we close the connection.
RespConn = close,
{RespType, Req2} = response(Status, Headers, RespHeaders, [ {RespType, Req2} = response(Status, Headers, RespHeaders, [
{<<"connection">>, <<"close">>}, {<<"connection">>, <<"close">>},
{<<"date">>, cowboy_clock:rfc1123()}, {<<"date">>, cowboy_clock:rfc1123()},
{<<"server">>, <<"Cowboy">>}, {<<"server">>, <<"Cowboy">>},
{<<"transfer-encoding">>, <<"identity">>} {<<"transfer-encoding">>, <<"identity">>}
], <<>>, Req#http_req{connection=close}), ], <<>>, Req),
if RespType =/= hook, Method =/= <<"HEAD">> -> if RespType =/= hook, Method =/= <<"HEAD">> ->
BodyFun(Socket, Transport); BodyFun(Socket, Transport);
true -> ok true -> ok
end; end;
{ContentLength, BodyFun} -> {ContentLength, BodyFun} ->
%% We stream the response body for ContentLength bytes. %% We stream the response body for ContentLength bytes.
RespConn = response_connection(Headers, Connection),
{RespType, Req2} = response(Status, Headers, RespHeaders, [ {RespType, Req2} = response(Status, Headers, RespHeaders, [
{<<"content-length">>, integer_to_list(ContentLength)}, {<<"content-length">>, integer_to_list(ContentLength)},
{<<"date">>, cowboy_clock:rfc1123()}, {<<"date">>, cowboy_clock:rfc1123()},
@ -941,9 +942,11 @@ reply(Status, Headers, Body, Req=#http_req{
true -> ok true -> ok
end; end;
_ when Compress -> _ when Compress ->
RespConn = response_connection(Headers, Connection),
Req2 = reply_may_compress(Status, Headers, Body, Req, Req2 = reply_may_compress(Status, Headers, Body, Req,
RespHeaders, HTTP11Headers, Method); RespHeaders, HTTP11Headers, Method);
_ -> _ ->
RespConn = response_connection(Headers, Connection),
Req2 = reply_no_compress(Status, Headers, Body, Req, Req2 = reply_no_compress(Status, Headers, Body, Req,
RespHeaders, HTTP11Headers, Method, iolist_size(Body)) RespHeaders, HTTP11Headers, Method, iolist_size(Body))
end, end,