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

Add a compress_buffering option to cowboy_compress_h

Browse source 
Also changes the behavior to disable buffering by default, so
that the default works in all cases, including server-sent events.
This commit is contained in:
Loïc Hoguin 2018-11-15 10:11:36 +01:00
parent 292039362a
commit fbfec873f6
No known key found for this signature in database
GPG key ID: 8A9DF795F6FED764
5 changed files with 79 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

55
test/compress_SUITE.erl
View file

@ -18,6 +18,7 @@
-import(ct_helper, [config/2]).
-import(ct_helper, [doc/1]).
-import(ct_helper, [name/0]).
-import(cowboy_test, [gun_open/1]).
%% ct.
@ -144,3 +145,57 @@ gzip_stream_reply_content_encoding(Config) ->
{_, <<"compress">>} = lists:keyfind(<<"content-encoding">>, 1, Headers),
100000 = iolist_size(Body),
ok.
opts_compress_buffering_false(Config0) ->
doc("Confirm that the compress_buffering option can be set to false, "
"which is the default."),
Fun = case config(ref, Config0) of
https_compress -> init_https;
h2_compress -> init_http2;
_ -> init_http
end,
Config = cowboy_test:Fun(name(), #{
env => #{dispatch => init_dispatch(Config0)},
stream_handlers => [cowboy_compress_h, cowboy_stream_h],
compress_buffering => false
}, Config0),
ConnPid = gun_open(Config),
Ref = gun:get(ConnPid, "/stream_reply/delayed",
[{<<"accept-encoding">>, <<"gzip">>}]),
{response, nofin, 200, Headers} = gun:await(ConnPid, Ref),
{_, <<"gzip">>} = lists:keyfind(<<"content-encoding">>, 1, Headers),
Z = zlib:open(),
zlib:inflateInit(Z, 31),
{data, nofin, Data1} = gun:await(ConnPid, Ref, 100),
<<"data: Hello!\r\n\r\n">> = iolist_to_binary(zlib:inflate(Z, Data1)),
timer:sleep(1000),
{data, nofin, Data2} = gun:await(ConnPid, Ref, 100),
<<"data: World!\r\n\r\n">> = iolist_to_binary(zlib:inflate(Z, Data2)),
gun:close(ConnPid),
cowboy:stop_listener(name()).
opts_compress_buffering_true(Config0) ->
doc("Confirm that the compress_buffering option can be set to true, "
"and that the data received is buffered."),
Fun = case config(ref, Config0) of
https_compress -> init_https;
h2_compress -> init_http2;
_ -> init_http
end,
Config = cowboy_test:Fun(name(), #{
env => #{dispatch => init_dispatch(Config0)},
stream_handlers => [cowboy_compress_h, cowboy_stream_h],
compress_buffering => true
}, Config0),
ConnPid = gun_open(Config),
Ref = gun:get(ConnPid, "/stream_reply/delayed",
[{<<"accept-encoding">>, <<"gzip">>}]),
{response, nofin, 200, Headers} = gun:await(ConnPid, Ref),
{_, <<"gzip">>} = lists:keyfind(<<"content-encoding">>, 1, Headers),
Z = zlib:open(),
zlib:inflateInit(Z, 31),
%% The data gets buffered because it is too small.
{data, nofin, Data1} = gun:await(ConnPid, Ref, 100),
<<>> = iolist_to_binary(zlib:inflate(Z, Data1)),
gun:close(ConnPid),
cowboy:stop_listener(name()).

8
test/handlers/compress_h.erl
View file

@ -50,6 +50,14 @@ init(Req0, State=stream_reply) ->
cowboy_req:stream_body({sendfile, 0, Size, AppFile}, nofin, Req1),
cowboy_req:stream_body(Data, nofin, Req1),
cowboy_req:stream_body({sendfile, 0, Size, AppFile}, fin, Req1),
Req1;
<<"delayed">> ->
Req1 = cowboy_req:stream_reply(200, Req0),
cowboy_req:stream_body(<<"data: Hello!\r\n\r\n">>, nofin, Req1),
timer:sleep(1000),
cowboy_req:stream_body(<<"data: World!\r\n\r\n">>, nofin, Req1),
timer:sleep(1000),
cowboy_req:stream_body(<<"data: Closing!\r\n\r\n">>, fin, Req1),
Req1
end,
{ok, Req, State}.