diff options
author | Loïc Hoguin <[email protected]> | 2018-11-15 10:11:36 +0100 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2018-11-15 10:11:36 +0100 |
commit | fbfec873f6026b858c3604d74d88470ce45f4296 (patch) | |
tree | 021fd12f5458d659e15a4bc7638b4dfd62a9df21 /src/cowboy_compress_h.erl | |
parent | 292039362a6125dfd0a163d5b0a49b800bf80b11 (diff) | |
download | cowboy-fbfec873f6026b858c3604d74d88470ce45f4296.tar.gz cowboy-fbfec873f6026b858c3604d74d88470ce45f4296.tar.bz2 cowboy-fbfec873f6026b858c3604d74d88470ce45f4296.zip |
Add a compress_buffering option to cowboy_compress_h
Also changes the behavior to disable buffering by default, so
that the default works in all cases, including server-sent events.
Diffstat (limited to 'src/cowboy_compress_h.erl')
-rw-r--r-- | src/cowboy_compress_h.erl | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/cowboy_compress_h.erl b/src/cowboy_compress_h.erl index ed81db6..bd3df42 100644 --- a/src/cowboy_compress_h.erl +++ b/src/cowboy_compress_h.erl @@ -25,7 +25,8 @@ next :: any(), threshold :: non_neg_integer() | undefined, compress = undefined :: undefined | gzip, - deflate = undefined :: undefined | zlib:zstream() + deflate = undefined :: undefined | zlib:zstream(), + deflate_flush = sync :: none | sync }). -spec init(cowboy_stream:streamid(), cowboy_req:req(), cowboy:opts()) @@ -33,8 +34,14 @@ init(StreamID, Req, Opts) -> State0 = check_req(Req), CompressThreshold = maps:get(compress_threshold, Opts, 300), + DeflateFlush = case maps:get(compress_buffering, Opts, false) of + false -> sync; + true -> none + end, {Commands0, Next} = cowboy_stream:init(StreamID, Req, Opts), - fold(Commands0, State0#state{next=Next, threshold=CompressThreshold}). + fold(Commands0, State0#state{next=Next, + threshold=CompressThreshold, + deflate_flush=DeflateFlush}). -spec data(cowboy_stream:streamid(), cowboy_stream:fin(), cowboy_req:resp_body(), State) -> {cowboy_stream:commands(), State} when State::#state{}. @@ -176,9 +183,10 @@ gzip_headers({headers, Status, Headers0}, State) -> %% includes a checksum at the end of the stream. We have %% to read the file in memory, making this not suitable for %% large files. -gzip_data({data, nofin, Sendfile={sendfile, _, _, _}}, State=#state{deflate=Z}) -> +gzip_data({data, nofin, Sendfile={sendfile, _, _, _}}, + State=#state{deflate=Z, deflate_flush=Flush}) -> {ok, Data0} = read_file(Sendfile), - Data = zlib:deflate(Z, Data0), + Data = zlib:deflate(Z, Data0, Flush), {{data, nofin, Data}, State}; gzip_data({data, fin, Sendfile={sendfile, _, _, _}}, State=#state{deflate=Z}) -> {ok, Data0} = read_file(Sendfile), @@ -186,8 +194,8 @@ gzip_data({data, fin, Sendfile={sendfile, _, _, _}}, State=#state{deflate=Z}) -> zlib:deflateEnd(Z), zlib:close(Z), {{data, fin, Data}, State#state{deflate=undefined}}; -gzip_data({data, nofin, Data0}, State=#state{deflate=Z}) -> - Data = zlib:deflate(Z, Data0), +gzip_data({data, nofin, Data0}, State=#state{deflate=Z, deflate_flush=Flush}) -> + Data = zlib:deflate(Z, Data0, Flush), {{data, nofin, Data}, State}; gzip_data({data, fin, Data0}, State=#state{deflate=Z}) -> Data = zlib:deflate(Z, Data0, finish), |