diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-11-09 15:09:40 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-11-11 14:46:23 +0100 |
| commit | 4b7be97512d6fc62b337e810f697a6bb0db1773c (patch) | |
| tree | 77927f0f07f49f7b4a49634b6c37416b458e66cb /lib/inets/test | |
| parent | f05f7ae5e8ea4b19be5fa49681ad6efb01daae6d (diff) | |
| download | otp-4b7be97512d6fc62b337e810f697a6bb0db1773c.tar.gz otp-4b7be97512d6fc62b337e810f697a6bb0db1773c.tar.bz2 otp-4b7be97512d6fc62b337e810f697a6bb0db1773c.zip | |
inets: httpd - Add possibility to specify socket options for HTTP
Was already possible for HTTPS. Also remove use of legacy option
inet6fb4. IPv6 standard moved away from beeing able to fallback to IPv4
so this option makes little sense, will use inet (Ipv4) as default instead of
inet6fb4.
Diffstat (limited to 'lib/inets/test')
| -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), |