diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-01 12:01:06 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-01 12:01:06 +0100 |
| commit | 61a64986b805ac8b140e25cb4caa4ad5430837a0 (patch) | |
| tree | 5b486e77148a1647acc1a4fb28ee346c64b453d2 /lib/inets/test | |
| parent | 850375f7de788d9d3b3252adb65b3491d5d10efc (diff) | |
| parent | d7a5a8a61f496708133863391f2a67a0ea47bdc7 (diff) | |
| download | otp-61a64986b805ac8b140e25cb4caa4ad5430837a0.tar.gz otp-61a64986b805ac8b140e25cb4caa4ad5430837a0.tar.bz2 otp-61a64986b805ac8b140e25cb4caa4ad5430837a0.zip | |
Merge branch 'ingela/inets/httpd-location/OTP-14716' into maint
* ingela/inets/httpd-location/OTP-14716:
inets: httpd - do not hardcode 302 status for location
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, |