diff options
| author | Erlang/OTP <[email protected]> | 2015-11-12 10:50:12 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-11-12 10:50:12 +0100 |
| commit | 29e1771c44d7d12ab7f0a52e1286886973d3b525 (patch) | |
| tree | 79431c2e8f5f3e775d2d33444f51176496a6a89f /lib/inets/test/httpd_SUITE.erl | |
| parent | fe1df7fc6bf050cb6c9bbd99eb9393c426b62f67 (diff) | |
| parent | 35214e082400c8a0a072308986271a28a7a1cc30 (diff) | |
| download | otp-29e1771c44d7d12ab7f0a52e1286886973d3b525.tar.gz otp-29e1771c44d7d12ab7f0a52e1286886973d3b525.tar.bz2 otp-29e1771c44d7d12ab7f0a52e1286886973d3b525.zip | |
Merge branch 'ia/maint-18/inets/httpd-chunk-length-handling/OTP-13061/nodelay/OTP-13062' into maint-18
* ia/maint-18/inets/httpd-chunk-length-handling/OTP-13061/nodelay/OTP-13062:
inets: Prepare for release
inets: Do not use internal or shell convenience functions in application
Inets: Clean up code
inets: httpd - Add possibility to specify socket options for HTTP
inets: Remove debug macros that mimic call trace
inets: Improve max header size handling
inets: CT'ify http_format_SUITE
inets: Terminate gracfully when an invalid chunked length header is encountered
Diffstat (limited to 'lib/inets/test/httpd_SUITE.erl')
| -rw-r--r-- | lib/inets/test/httpd_SUITE.erl | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl index b50d31a5c1..9bd6f3636c 100644 --- a/lib/inets/test/httpd_SUITE.erl +++ b/lib/inets/test/httpd_SUITE.erl @@ -1434,9 +1434,11 @@ server_config(http_reload, Config) -> server_config(https_reload, Config) -> [{keep_alive_timeout, 2}] ++ server_config(https, Config); server_config(http_limit, Config) -> - [{max_clients, 1}, - %% Make sure option checking code is run - {max_content_length, 100000002}] ++ server_config(http, Config); + Conf = [{max_clients, 1}, + %% Make sure option checking code is run + {max_content_length, 100000002}] ++ server_config(http, Config), + ct:pal("Received message ~p~n", [Conf]), + Conf; server_config(http_custom, Config) -> [{customize, ?MODULE}] ++ server_config(http, Config); server_config(https_custom, Config) -> @@ -1486,6 +1488,7 @@ server_config(http_mime_types, Config0) -> server_config(http, Config) -> ServerRoot = ?config(server_root, Config), [{port, 0}, + {socket_type, {ip_comm, [{nodelay, true}]}}, {server_name,"httpd_test"}, {server_root, ServerRoot}, {document_root, ?config(doc_root, Config)}, @@ -1507,13 +1510,14 @@ server_config(http, Config) -> server_config(https, Config) -> PrivDir = ?config(priv_dir, Config), [{socket_type, {essl, - [{cacertfile, - filename:join(PrivDir, "public_key_cacert.pem")}, - {certfile, - filename:join(PrivDir, "public_key_cert.pem")}, - {keyfile, - filename:join(PrivDir, "public_key_cert_key.pem")} - ]}}] ++ server_config(http, Config). + [{nodelay, true}, + {cacertfile, + filename:join(PrivDir, "public_key_cacert.pem")}, + {certfile, + filename:join(PrivDir, "public_key_cert.pem")}, + {keyfile, + filename:join(PrivDir, "public_key_cert_key.pem")} + ]}}] ++ proplists:delete(socket_type, server_config(http, Config)). init_httpd(Group, Config0) -> Config1 = proplists:delete(port, Config0), |