diff options
| author | Alexey Lebedeff <[email protected]> | 2015-07-28 23:20:51 +0300 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-08-07 15:30:09 +0200 |
| commit | 8c60dd6c1b56aeef4493142adcbd8fb0ab6917ef (patch) | |
| tree | 4181c522ac1f91491c92c13dfcc768c5fbc6b666 /src | |
| parent | 19a279dfdc923091616bcdd700e1a59e4c2404f4 (diff) | |
| download | cowboy-8c60dd6c1b56aeef4493142adcbd8fb0ab6917ef.tar.gz cowboy-8c60dd6c1b56aeef4493142adcbd8fb0ab6917ef.tar.bz2 cowboy-8c60dd6c1b56aeef4493142adcbd8fb0ab6917ef.zip | |
Use 'Connection' header only when necessary
Fixes #839 when 'Connection: Keep-Alive' wasn't sent in a HTTP/1.0
response. Now the usage of 'Connection' header is consistent with
current protocol version: when this header is not specified explicitly
in the response, HTTP/1.0 implies 'Connection: close' and HTTP/1.1
implies 'Connection: Keep-Alive'. So if current 'Connection' value
matches the default value of current protocol, we won't state obvious
fact in the response; and vice versa.
Amended to fix and improve tests, and revert the variable name
change from HTTP11Headers to StdHeaders. I think it's still good
to leave it as is because it's not really a standard header for
HTTP/1.0, and it's gone from HTTP/2 entirely.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cowboy_req.erl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/cowboy_req.erl b/src/cowboy_req.erl index 27c59cf..fcc9744 100644 --- a/src/cowboy_req.erl +++ b/src/cowboy_req.erl @@ -820,7 +820,9 @@ reply(Status, Headers, Body, Req=#http_req{ resp_state=RespState, resp_headers=RespHeaders}) when RespState =:= waiting; RespState =:= waiting_stream -> HTTP11Headers = if - Transport =/= cowboy_spdy, Version =:= 'HTTP/1.1' -> + Transport =/= cowboy_spdy, Version =:= 'HTTP/1.0', Connection =:= keepalive -> + [{<<"connection">>, atom_to_connection(Connection)}]; + Transport =/= cowboy_spdy, Version =:= 'HTTP/1.1', Connection =:= close -> [{<<"connection">>, atom_to_connection(Connection)}]; true -> [] @@ -1134,13 +1136,20 @@ chunked_response(Status, Headers, Req=#http_req{ when RespState =:= waiting; RespState =:= waiting_stream -> RespConn = response_connection(Headers, Connection), HTTP11Headers = if + Version =:= 'HTTP/1.0', Connection =:= keepalive -> + [{<<"connection">>, atom_to_connection(Connection)}]; Version =:= 'HTTP/1.0' -> []; true -> MaybeTE = if RespState =:= waiting_stream -> []; true -> [{<<"transfer-encoding">>, <<"chunked">>}] end, - [{<<"connection">>, atom_to_connection(Connection)}|MaybeTE] + if + Connection =:= close -> + [{<<"connection">>, atom_to_connection(Connection)}|MaybeTE]; + true -> + MaybeTE + end end, RespState2 = if Version =:= 'HTTP/1.1', RespState =:= 'waiting' -> chunks; |