diff options
| author | Loïc Hoguin <[email protected]> | 2012-03-13 03:00:05 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2012-03-13 03:00:05 +0100 |
| commit | 36a6823e50e36c201df6c7a88a4c77cdaac7f2e6 (patch) | |
| tree | bd8f0c48615616f7146d94496bb466d0e917f638 /src/cowboy_http_req.erl | |
| parent | e87f51e542a9ee5bdcadd5841731b32210732e08 (diff) | |
| download | cowboy-36a6823e50e36c201df6c7a88a4c77cdaac7f2e6.tar.gz cowboy-36a6823e50e36c201df6c7a88a4c77cdaac7f2e6.tar.bz2 cowboy-36a6823e50e36c201df6c7a88a4c77cdaac7f2e6.zip | |
Do not send chunked Transfer-Encoding replies for HTTP/1.0
Fixes compatibility issue #140 reported by @majek.
Diffstat (limited to 'src/cowboy_http_req.erl')
| -rw-r--r-- | src/cowboy_http_req.erl | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/cowboy_http_req.erl b/src/cowboy_http_req.erl index 6b947d9..c352bbf 100644 --- a/src/cowboy_http_req.erl +++ b/src/cowboy_http_req.erl @@ -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">>]). |