diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-10-24 17:55:24 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-10-31 10:17:13 +0100 |
| commit | d7a5a8a61f496708133863391f2a67a0ea47bdc7 (patch) | |
| tree | 5b474042155043c1abb4740d92b5e13380e9ca69 /lib/inets/test | |
| parent | d4f61c4e26005740388668f3773871f043366342 (diff) | |
| download | otp-d7a5a8a61f496708133863391f2a67a0ea47bdc7.tar.gz otp-d7a5a8a61f496708133863391f2a67a0ea47bdc7.tar.bz2 otp-d7a5a8a61f496708133863391f2a67a0ea47bdc7.zip | |
inets: httpd - do not hardcode 302 status for location
If a status code is provide by the ESI script that status code should have
precedence over internal defaults.
Also remove RFC 2616 requirement that URI must be absolute, that requirement
is relaxed by RFC 7231.
Diffstat (limited to 'lib/inets/test')
| -rw-r--r-- | lib/inets/test/http_format_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/inets/test/httpd_mod.erl | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl index 4e10a97f58..9a13ed3d17 100644 --- a/lib/inets/test/http_format_SUITE.erl +++ b/lib/inets/test/http_format_SUITE.erl @@ -535,7 +535,7 @@ esi_parse_headers(Config) when is_list(Config) -> {"location","http://foo.bar.se"}], 302} = httpd_esi:handle_headers(Headers2), - {proceed,"/foo/bar.html"} = + {ok,[{"location","/foo/bar.html"}], 302} = httpd_esi:handle_headers("location:/foo/bar.html\r\n"). %%-------------------------------------------------------------------- diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl index d9118aa1a4..2035b50248 100644 --- a/lib/inets/test/httpd_mod.erl +++ b/lib/inets/test/httpd_mod.erl @@ -779,9 +779,14 @@ esi(Type, Port, Host, Node) -> [{statuscode, 200}, {no_header, "cache-control"}, {version, "HTTP/1.0"}]), + ok = httpd_test_lib:verify_request(Type, Host, Port, Node, + "GET /cgi-bin/erl/httpd_example:new_status_and_location" + " HTTP/1.1\r\n\r\n", + [{statuscode, 201}, + {header, "Location"}, + {version, "HTTP/1.1"}]), ok. - %%-------------------------------------------------------------------- get(Type, Port, Host, Node) -> ok = httpd_test_lib:verify_request(Type, Host, Port, Node, |