aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/httpd_basic_SUITE.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-10 15:45:06 +0100
committerMicael Karlberg <[email protected]>2011-03-10 15:45:06 +0100
commitd612652cc71da9660b101db70a9f163b66c4b53a (patch)
tree4facbe73ce6492549080d4366740c597481102cc /lib/inets/test/httpd_basic_SUITE.erl
parent8533b8bcae728783b1c066b9fecb96b1cc2eb03c (diff)
parent4827d5db5fb2ca10772f70fbb6ad7f7f99285d96 (diff)
downloadotp-d612652cc71da9660b101db70a9f163b66c4b53a.tar.gz
otp-d612652cc71da9660b101db70a9f163b66c4b53a.tar.bz2
otp-d612652cc71da9660b101db70a9f163b66c4b53a.zip
Merge branch 'ms/inets-prevent_xss_in_error_pages' into bmk/inets/httpd/prevent_xss_in_error_pages/OTP-9124
Diffstat (limited to 'lib/inets/test/httpd_basic_SUITE.erl')
-rw-r--r--lib/inets/test/httpd_basic_SUITE.erl11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index dcea200a1a..1cb07c2f5b 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -151,12 +151,13 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
URL = ?URL_START ++ integer_to_list(Port) ++ Path,
EscapedPath = http_uri:encode(Path),
{ok, {404, Body}} = httpc:request(get, {URL, []},
- [{url_encode, true}],
- [{version, "HTTP/1.0"}, {full_result, false}]),
+ [{url_encode, true}, {version, "HTTP/1.0"}],
+ [{full_result, false}]),
EscapedPath = find_URL_path(string:tokens(Body, " ")),
- {ok, {404, Body1}} = httpc:request(get, {URL, []}, [],
- [{version, "HTTP/1.0"}, {full_result, false}]),
- EscapedPath = find_URL_path(string:tokens(Body1, " ")),
+ {ok, {404, Body1}} = httpc:request(get, {URL, []},
+ [{version, "HTTP/1.0"}], [{full_result, false}]),
+ HTMLEncodedPath = http_util:html_encode(Path),
+ HTMLEncodedPath = find_URL_path(string:tokens(Body1, " ")),
inets:stop(httpd, Pid).
find_URL_path([]) ->