From d7b7580b3913c17b404319cc4c153748d5e59194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Fri, 9 Nov 2018 17:42:37 +0100 Subject: Add sendfile support to cowboy_req:stream_body It is now possible to stream one or more sendfile tuples. A simple example of what can now be done would be for example to build a tar file on the fly using the sendfile syscall for sending the files, or to support Range requests with more than one range with the sendfile syscall. When using cowboy_compress_h unfortunately we have to read the file in order to send it. More options will be added at a later time to make sure users don't read too much into memory. This is a new feature however so existing code is not affected. Also rework cowboy_http's data sending to be flatter. --- test/req_SUITE.erl | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'test/req_SUITE.erl') diff --git a/test/req_SUITE.erl b/test/req_SUITE.erl index 6ca4521..9520699 100644 --- a/test/req_SUITE.erl +++ b/test/req_SUITE.erl @@ -885,21 +885,44 @@ stream_reply3(Config) -> {500, _, _} = do_get("/resp/stream_reply3/error", Config), ok. -stream_body_multiple(Config) -> - doc("Streamed body via multiple calls."), - {200, _, <<"Hello world!">>} = do_get("/resp/stream_body/multiple", Config), - ok. - stream_body_fin0(Config) -> doc("Streamed body with last chunk of size 0."), {200, _, <<"Hello world!">>} = do_get("/resp/stream_body/fin0", Config), ok. +stream_body_multiple(Config) -> + doc("Streamed body via multiple calls."), + {200, _, <<"Hello world!">>} = do_get("/resp/stream_body/multiple", Config), + ok. + stream_body_nofin(Config) -> doc("Unfinished streamed body."), {200, _, <<"Hello world!">>} = do_get("/resp/stream_body/nofin", Config), ok. +stream_body_sendfile(Config) -> + doc("Streamed body via multiple calls, including sendfile calls."), + {ok, AppFile} = file:read_file(code:where_is_file("cowboy.app")), + ExpectedBody = iolist_to_binary([ + <<"Hello ">>, + AppFile, + <<" interspersed ">>, + AppFile, + <<" world!">> + ]), + {200, _, ExpectedBody} = do_get("/resp/stream_body/sendfile", Config), + ok. + +stream_body_sendfile_fin(Config) -> + doc("Streamed body via multiple calls, including a sendfile final call."), + {ok, AppFile} = file:read_file(code:where_is_file("cowboy.app")), + ExpectedBody = iolist_to_binary([ + <<"Hello! ">>, + AppFile + ]), + {200, _, ExpectedBody} = do_get("/resp/stream_body/sendfile_fin", Config), + ok. + stream_body_content_length_multiple(Config) -> doc("Streamed body via multiple calls."), {200, _, <<"Hello world!">>} = do_get("/resp/stream_body_content_length/multiple", Config), -- cgit v1.2.3