diff options
author | Fredrik Gustafsson <[email protected]> | 2013-08-22 15:36:13 +0200 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-08-22 15:36:13 +0200 |
commit | 5e2f9c13426ad4048d563c730bf29f8b677e6fb5 (patch) | |
tree | d58ba7a398a9252af26a6379b8f8e709e41772fd /lib/inets/test | |
parent | 4f61d1501e47d824a5c761300e8a21d9c5f1c5b7 (diff) | |
parent | 424021bb4253cbf0f864b97666497b82b5da66c1 (diff) | |
download | otp-5e2f9c13426ad4048d563c730bf29f8b677e6fb5.tar.gz otp-5e2f9c13426ad4048d563c730bf29f8b677e6fb5.tar.bz2 otp-5e2f9c13426ad4048d563c730bf29f8b677e6fb5.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/inets/test')
-rw-r--r-- | lib/inets/test/httpd_basic_SUITE.erl | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl index 523cf9d38c..fef0a1f0f4 100644 --- a/lib/inets/test/httpd_basic_SUITE.erl +++ b/lib/inets/test/httpd_basic_SUITE.erl @@ -33,7 +33,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> [ uri_too_long_414, - header_too_long_413, + header_too_long_413, + erl_script_nocache_opt, escaped_url_in_error_body, slowdose ]. @@ -178,6 +179,28 @@ header_too_long_413(Config) when is_list(Config) -> {version, "HTTP/1.1"}]), inets:stop(httpd, Pid). +%%------------------------------------------------------------------------- +%%------------------------------------------------------------------------- + +erl_script_nocache_opt(doc) -> + ["Test that too long headers's get 413 HTTP code"]; +erl_script_nocache_opt(suite) -> + []; +erl_script_nocache_opt(Config) when is_list(Config) -> + HttpdConf = ?config(httpd_conf, Config), + {ok, Pid} = inets:start(httpd, [{port, 0}, {erl_script_nocache, true} | HttpdConf]), + Info = httpd:info(Pid), + Port = proplists:get_value(port, Info), + _Address = proplists:get_value(bind_address, Info), + URL1 = ?URL_START ++ integer_to_list(Port), + case httpc:request(get, {URL1 ++ "/dummy.html", []}, + [{url_encode, false}, + {version, "HTTP/1.0"}], + [{full_result, false}]) of + {ok, {200, _}} -> + ok + end, + inets:stop(httpd, Pid). %%------------------------------------------------------------------------- %%------------------------------------------------------------------------- |