diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:41:31 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:41:31 +0100 |
| commit | 744984833cc1a51f51781e3417db7f152eeab4ae (patch) | |
| tree | 48a2c08a403d830755e19fc7e2bb452d44f584dd /lib/inets/test/httpd_1_1.erl | |
| parent | 41db1e8520171908b3ebc4ecd1d09d83dd4dc535 (diff) | |
| parent | 44c4ecd8bad76c1ecc2eae2d23ebf212f1c299b9 (diff) | |
| download | otp-744984833cc1a51f51781e3417db7f152eeab4ae.tar.gz otp-744984833cc1a51f51781e3417db7f152eeab4ae.tar.bz2 otp-744984833cc1a51f51781e3417db7f152eeab4ae.zip | |
Merge branch 'ia/inets/httpd-manager-improvments/OTP-11557' into maint
* ia/inets/httpd-manager-improvments/OTP-11557:
inets: Prepare for release
inets: Remove log message as it causes more harm than use at the moment
inets: Mend broken max_clients check
inets: Start CT'ify httpd_SUITE
inets: Remove use of default gen_server timeout
Diffstat (limited to 'lib/inets/test/httpd_1_1.erl')
| -rw-r--r-- | lib/inets/test/httpd_1_1.erl | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/inets/test/httpd_1_1.erl b/lib/inets/test/httpd_1_1.erl index 07d94ea97a..4b2a5f619d 100644 --- a/lib/inets/test/httpd_1_1.erl +++ b/lib/inets/test/httpd_1_1.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2011. All Rights Reserved. +%% Copyright Ericsson AB 2005-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -20,8 +20,6 @@ -module(httpd_1_1). --include("test_server.hrl"). --include("test_server_line.hrl"). -include_lib("kernel/include/file.hrl"). -export([host/4, chunked/4, expect/4, range/4, if_test/5, http_trace/4, @@ -40,14 +38,10 @@ %%------------------------------------------------------------------------- -%% Test cases starts here. +%% Test cases %%------------------------------------------------------------------------- host(Type, Port, Host, Node) -> - %% No host needed for HTTP/1.0 - ok = httpd_test_lib:verify_request(Type, Host, Port, Node, - "GET / HTTP/1.0\r\n\r\n", - [{statuscode, 200}, - {version, "HTTP/1.0"}]), + %% No host must generate an error ok = httpd_test_lib:verify_request(Type, Host, Port, Node, "GET / HTTP/1.1\r\n\r\n", |