aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2011-10-05 17:55:25 +0200
committerLoïc Hoguin <[email protected]>2011-10-05 18:30:23 +0200
commitc2be0f20736bf3867b044e2f2bf6eb4fb862daf1 (patch)
treeeea78e7e90a2fddec0b521e71bc1e5891bc9f43a /src
parent8eb7af0a0b2c3a519b409bca04c4f029106cd7c9 (diff)
downloadcowboy-c2be0f20736bf3867b044e2f2bf6eb4fb862daf1.tar.gz
cowboy-c2be0f20736bf3867b044e2f2bf6eb4fb862daf1.tar.bz2
cowboy-c2be0f20736bf3867b044e2f2bf6eb4fb862daf1.zip
Remove the 'HEAD' chunked_reply/3 clause
From the RFC: The HEAD method is identical to GET except that the server MUST NOT return a message-body in the response. The metainformation contained in the HTTP headers in response to a HEAD request SHOULD be identical to the information sent in response to a GET request.
Diffstat (limited to 'src')
-rw-r--r--src/cowboy_http_protocol.erl2
-rw-r--r--src/cowboy_http_req.erl8
2 files changed, 2 insertions, 8 deletions
diff --git a/src/cowboy_http_protocol.erl b/src/cowboy_http_protocol.erl
index dc226a6..0a6bddf 100644
--- a/src/cowboy_http_protocol.erl
+++ b/src/cowboy_http_protocol.erl
@@ -284,6 +284,8 @@ ensure_response(Req=#http_req{resp_state=waiting}) ->
_ = cowboy_http_req:reply(204, [], [], Req),
ok;
%% Close the chunked reply.
+ensure_response(#http_req{method='HEAD', resp_state=chunks}) ->
+ close;
ensure_response(#http_req{socket=Socket, transport=Transport,
resp_state=chunks}) ->
Transport:send(Socket, <<"0\r\n\r\n">>),
diff --git a/src/cowboy_http_req.erl b/src/cowboy_http_req.erl
index 808a108..889fb10 100644
--- a/src/cowboy_http_req.erl
+++ b/src/cowboy_http_req.erl
@@ -336,14 +336,6 @@ reply(Code, Headers, Body, Req=#http_req{socket=Socket,
-spec chunked_reply(http_status(), http_headers(), #http_req{})
-> {ok, #http_req{}}.
chunked_reply(Code, Headers, Req=#http_req{socket=Socket, transport=Transport,
- method='HEAD', resp_state=waiting}) ->
- Head = response_head(Code, Headers, [
- {<<"Date">>, cowboy_clock:rfc1123()},
- {<<"Server">>, <<"Cowboy">>}
- ]),
- Transport:send(Socket, Head),
- {ok, Req#http_req{resp_state=done}};
-chunked_reply(Code, Headers, Req=#http_req{socket=Socket, transport=Transport,
resp_state=waiting}) ->
Head = response_head(Code, Headers, [
{<<"Connection">>, <<"close">>},