diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-10-12 12:07:20 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-10-12 12:07:20 +0200 |
| commit | 3d809548a8e10f719a4d0bd6580e4e0dbd809888 (patch) | |
| tree | 752a1f00e32592dcc8548411ccd21bf0384e511b | |
| parent | 3ec66701f91eba6a7a12a813b2283c2e733f62c1 (diff) | |
| parent | f37f9eac178836e6bcdf575fa4c72642f146de35 (diff) | |
| download | otp-3d809548a8e10f719a4d0bd6580e4e0dbd809888.tar.gz otp-3d809548a8e10f719a4d0bd6580e4e0dbd809888.tar.bz2 otp-3d809548a8e10f719a4d0bd6580e4e0dbd809888.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/inets/src/http_server/httpd_script_env.erl | 4 | ||||
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/inets/src/http_server/httpd_script_env.erl b/lib/inets/src/http_server/httpd_script_env.erl index 055f08fdb0..d7c92c59ef 100644 --- a/lib/inets/src/http_server/httpd_script_env.erl +++ b/lib/inets/src/http_server/httpd_script_env.erl @@ -166,9 +166,9 @@ create_script_elements(cgi, path_info, PathInfo, ModData) -> [{"PATH_INFO", PathInfo}, {"PATH_TRANSLATED", PathTranslated}]; create_script_elements(esi, entity_body, Body, _) -> - [{content_length, httpd_util:flatlength(Body)}]; + [{content_length, integer_to_list(httpd_util:flatlength(Body))}]; create_script_elements(cgi, entity_body, Body, _) -> - [{"CONTENT_LENGTH", httpd_util:flatlength(Body)}]; + [{"CONTENT_LENGTH", integer_to_list(httpd_util:flatlength(Body))}]; create_script_elements(_, _, _, _) -> []. diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index e6dcd2285f..5dfb1474e5 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -42,7 +42,8 @@ %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- suite() -> - [{ct_hooks,[ts_install_cth]} + [{ct_hooks,[ts_install_cth]}, + {timetrap,{seconds, 30}} ]. all() -> @@ -142,7 +143,6 @@ misc() -> %%-------------------------------------------------------------------- init_per_suite(Config) -> - ct:timetrap({seconds, 30}), PrivDir = proplists:get_value(priv_dir, Config), DataDir = proplists:get_value(data_dir, Config), inets_test_lib:start_apps([inets]), @@ -169,7 +169,6 @@ init_per_group(Group, Config0) when Group =:= sim_https; Group =:= https-> catch crypto:stop(), try crypto:start() of ok -> - ct:timetrap({seconds, 30}), start_apps(Group), do_init_per_group(Group, Config0) catch |