diff options
| author | Péter Dimitrov <[email protected]> | 2018-08-27 16:18:18 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2018-08-27 16:18:18 +0200 |
| commit | 7db7a1caeeee21682f37cfa95f9f026074e03ccf (patch) | |
| tree | e47255259cece7ba59140f56dbe7aa2aee45bfaa /lib/inets/src/http_server/mod_esi.erl | |
| parent | b47fa83ff514feafa3debe841f2697c29fa2ca49 (diff) | |
| parent | ab8faff46daf24db6f20dc2a307cf68d53034450 (diff) | |
| download | otp-7db7a1caeeee21682f37cfa95f9f026074e03ccf.tar.gz otp-7db7a1caeeee21682f37cfa95f9f026074e03ccf.tar.bz2 otp-7db7a1caeeee21682f37cfa95f9f026074e03ccf.zip | |
Merge branch 'maint-20' into maint
* maint-20:
inets: Prepare for release
inets: Robust handling of 204, 304, 1xx responses
inets: Do not use chunked encoding with 1xx, 204, 304
Change-Id: Ia88eb1d217b46fb01b1d7544d9ef34788c87abbd
Diffstat (limited to 'lib/inets/src/http_server/mod_esi.erl')
| -rw-r--r-- | lib/inets/src/http_server/mod_esi.erl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl index 21aafa7f7b..443b7ee564 100644 --- a/lib/inets/src/http_server/mod_esi.erl +++ b/lib/inets/src/http_server/mod_esi.erl @@ -394,7 +394,16 @@ deliver_webpage_chunk(#mod{config_db = Db} = ModData, Pid, Timeout) -> Continue; {Headers, Body} -> {ok, NewHeaders, StatusCode} = httpd_esi:handle_headers(Headers), - IsDisableChunkedSend = httpd_response:is_disable_chunked_send(Db), + %% All 1xx (informational), 204 (no content), and 304 (not modified) + %% responses MUST NOT include a message-body, and thus are always + %% terminated by the first empty line after the header fields. + %% This implies that chunked encoding MUST NOT be used for these + %% status codes. + IsDisableChunkedSend = + httpd_response:is_disable_chunked_send(Db) orelse + StatusCode =:= 204 orelse %% No Content + StatusCode =:= 304 orelse %% Not Modified + (100 =< StatusCode andalso StatusCode =< 199), %% Informational case (ModData#mod.http_version =/= "HTTP/1.1") or (IsDisableChunkedSend) of true -> @@ -405,8 +414,8 @@ deliver_webpage_chunk(#mod{config_db = Db} = ModData, Pid, Timeout) -> send_headers(ModData, StatusCode, [{"transfer-encoding", "chunked"} | NewHeaders]) - end, - handle_body(Pid, ModData, Body, Timeout, length(Body), + end, + handle_body(Pid, ModData, Body, Timeout, length(Body), IsDisableChunkedSend); timeout -> send_headers(ModData, 504, [{"connection", "close"}]), |