From 917cf99e10c41676183d501b86af6e47c95afb89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Thu, 6 Feb 2014 19:36:25 +0100 Subject: Add and document the new multipart code The old undocumented API is removed entirely. While a documentation exists for the new API, it will not be considered set in stone until further testing has been performed, and a file upload example has been added. The new API should be a little more efficient than the old API, especially with smaller messages. --- test/http_SUITE.erl | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'test/http_SUITE.erl') diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl index 13e7b0b..20c65c8 100644 --- a/test/http_SUITE.erl +++ b/test/http_SUITE.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2013, Loïc Hoguin +%% Copyright (c) 2011-2014, Loïc Hoguin %% Copyright (c) 2011, Anthony Ramine %% %% Permission to use, copy, modify, and/or distribute this software for any @@ -49,6 +49,7 @@ -export([keepalive_nl/1]). -export([keepalive_stream_loop/1]). -export([multipart/1]). +-export([multipart_large/1]). -export([nc_rand/1]). -export([nc_zero/1]). -export([onrequest/1]). @@ -135,6 +136,7 @@ groups() -> keepalive_nl, keepalive_stream_loop, multipart, + multipart_large, nc_rand, nc_zero, pipeline, @@ -391,6 +393,7 @@ init_dispatch(Config) -> {"/static_specify_file/[...]", cowboy_static, {file, ?config(static_dir, Config) ++ "/style.css"}}, {"/multipart", http_multipart, []}, + {"/multipart/large", http_multipart_stream, []}, {"/echo/body", http_echo_body, []}, {"/echo/body_qs", http_body_qs, []}, {"/param_all", rest_param_all, []}, @@ -755,8 +758,8 @@ multipart(Config) -> "This is a preamble." "\r\n--OHai\r\nX-Name:answer\r\n\r\n42" "\r\n--OHai\r\nServer:Cowboy\r\n\r\nIt rocks!\r\n" - "\r\n--OHai--" - "This is an epiloque." + "\r\n--OHai--\r\n" + "This is an epilogue." >>, {ok, Client2} = cowboy_client:request(<<"POST">>, build_url("/multipart", Config), @@ -770,6 +773,21 @@ multipart(Config) -> {[{<<"server">>, <<"Cowboy">>}], <<"It rocks!\r\n">>} ]. +multipart_large(Config) -> + Client = ?config(client, Config), + Boundary = "----------", + Big = << 0:9000000/unit:8 >>, + Bigger = << 0:9999999/unit:8 >>, + Body = ["--", Boundary, "\r\ncontent-length: 9000000\r\n\r\n", Big, "\r\n", + "--", Boundary, "\r\ncontent-length: 9999999\r\n\r\n", Bigger, "\r\n", + "--", Boundary, "--\r\n"], + {ok, Client2} = cowboy_client:request(<<"POST">>, + build_url("/multipart/large", Config), + [{<<"content-type">>, ["multipart/x-large; boundary=", Boundary]}], + Body, Client), + {ok, 200, _, _} = cowboy_client:response(Client2), + ok. + nc_reqs(Config, Input) -> Cat = os:find_executable("cat"), Nc = os:find_executable("nc"), -- cgit v1.2.3