aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/httpd_SUITE.erl
diff options
context:
space:
mode:
authorPéter Dimitrov <[email protected]>2019-03-08 14:58:13 +0100
committerPéter Dimitrov <[email protected]>2019-03-08 14:58:13 +0100
commit6bbf8fd8526b1a2b8510f5cd32b47d3195591036 (patch)
treefda3d9b92d78af24f0ed37e6f567b2eb159e759a /lib/inets/test/httpd_SUITE.erl
parentf39d734ed638a7e431993c05b143d2cc5bef1690 (diff)
parent9377eeb3335a1552bd8a55a774da1608575ef039 (diff)
downloadotp-6bbf8fd8526b1a2b8510f5cd32b47d3195591036.tar.gz
otp-6bbf8fd8526b1a2b8510f5cd32b47d3195591036.tar.bz2
otp-6bbf8fd8526b1a2b8510f5cd32b47d3195591036.zip
Merge branch 'maint'
* maint: inets: Fix handling of erl_script_timeout Change-Id: Ie6028000b0bd45307477d837f63c51b2620faaea
Diffstat (limited to 'lib/inets/test/httpd_SUITE.erl')
-rw-r--r--lib/inets/test/httpd_SUITE.erl15
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 5b6740fba3..fcb9ad7905 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -78,7 +78,8 @@ all() ->
{group, http_rel_path_script_alias},
{group, http_not_sup},
{group, https_not_sup},
- mime_types_format
+ mime_types_format,
+ erl_script_timeout_option
].
groups() ->
@@ -1777,6 +1778,18 @@ mime_types_format(Config) when is_list(Config) ->
{"hqx","application/mac-binhex40"}]} = httpd_conf:load_mime_types(MimeTypes).
+erl_script_timeout_option(Config) when is_list(Config) ->
+ inets:start(),
+ {ok, Pid} = inets:start(httpd, [{erl_script_timeout, 215},
+ {server_name, "test"},
+ {port,0},
+ {server_root, "."},
+ {document_root, "."}]),
+ Info = httpd:info(Pid),
+ 215 = proplists:get_value(erl_script_timeout, Info),
+ inets:stop().
+
+
%%--------------------------------------------------------------------
%% Internal functions -----------------------------------
%%--------------------------------------------------------------------