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

Do not send chunked Transfer-Encoding replies for HTTP/1.0

Browse source 
Fixes compatibility issue #140 reported by @majek.
This commit is contained in:
Loïc Hoguin 2012-03-13 03:00:05 +01:00
parent e87f51e542
commit 36a6823e50
3 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cowboy_http_protocol.erl
View file

@ -402,6 +402,8 @@ ensure_response(Req=#http_req{resp_state=waiting}) ->
%% Close the chunked reply.
ensure_response(#http_req{method='HEAD', resp_state=chunks}) ->
close;
ensure_response(#http_req{version={1, 0}, resp_state=chunks}) ->
close;
ensure_response(#http_req{socket=Socket, transport=Transport,
resp_state=chunks}) ->
Transport:send(Socket, <<"0\r\n\r\n">>),

20
src/cowboy_http_req.erl
View file

@ -579,15 +579,21 @@ chunked_reply(Status, Req) ->
-spec chunked_reply(cowboy_http:status(), cowboy_http:headers(), #http_req{})
-> {ok, #http_req{}}.
chunked_reply(Status, Headers, Req=#http_req{socket=Socket,
transport=Transport, connection=Connection, pid=ReqPid,
resp_state=waiting, resp_headers=RespHeaders}) ->
transport=Transport, version=Version, connection=Connection,
pid=ReqPid, resp_state=waiting, resp_headers=RespHeaders}) ->
RespConn = response_connection(Headers, Connection),
Head = response_head(Status, Headers, RespHeaders, [
{<<"Connection">>, atom_to_connection(Connection)},
{<<"Transfer-Encoding">>, <<"chunked">>},
DefaultHeaders = [
{<<"Date">>, cowboy_clock:rfc1123()},
{<<"Server">>, <<"Cowboy">>}
]),
],
DefaultHeaders2 = case Version of
{1, 1} -> [
{<<"Connection">>, atom_to_connection(Connection)},
{<<"Transfer-Encoding">>, <<"chunked">>}
] ++ DefaultHeaders;
_ -> DefaultHeaders
end,
Head = response_head(Status, Headers, RespHeaders, DefaultHeaders2),
Transport:send(Socket, Head),
ReqPid ! {?MODULE, resp_sent},
{ok, Req#http_req{connection=RespConn, resp_state=chunks,
@ -599,6 +605,8 @@ chunked_reply(Status, Headers, Req=#http_req{socket=Socket,
-spec chunk(iodata(), #http_req{}) -> ok | {error, atom()}.
chunk(_Data, #http_req{socket=_Socket, transport=_Transport, method='HEAD'}) ->
ok;
chunk(Data, #http_req{socket=Socket, transport=Transport, version={1, 0}}) ->
Transport:send(Socket, Data);
chunk(Data, #http_req{socket=Socket, transport=Transport, resp_state=chunks}) ->
Transport:send(Socket, [integer_to_list(iolist_size(Data), 16),
<<"\r\n">>, Data, <<"\r\n">>]).