diff options
| author | Erlang/OTP <[email protected]> | 2011-11-01 18:42:42 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-11-01 18:42:42 +0100 |
| commit | 65db6eb562b0376dd29fc60e9378d7b3b8ac386b (patch) | |
| tree | 26c5761f96eabdd7f4f1ec83e5edb7853b180db6 /lib/inets/test/httpd_SUITE.erl | |
| parent | f8b20b4a995727f0339074d23a0fae50712683d2 (diff) | |
| parent | f8f0496c1b85169f6e72b6f875c521f09a471bbf (diff) | |
| download | otp-65db6eb562b0376dd29fc60e9378d7b3b8ac386b.tar.gz otp-65db6eb562b0376dd29fc60e9378d7b3b8ac386b.tar.bz2 otp-65db6eb562b0376dd29fc60e9378d7b3b8ac386b.zip | |
Merge branch 'bmk/inets/inets536_integration' into maint-r13
* bmk/inets/inets536_integration:
[httpd] GET request with malformed header date caused server crash (non-fatal) with no reply to client. Will now result in a reply with status code 400. OTP-9674
Added versions 5.2, 5.1.3 and 5.1.2 again. OTP-9655
Uncommented ipv6 test cases. OTP-9655
Fixed HTML encode. First *try* to hex decode uri, and then do the actual html encode. OTP-9655
Skip catching hex decode failure. OTP-9655
Fixed hex-decoding. OTP-9655
Problems with proxy test cases. OTP-9655
Added release notes, appup and correct version. OTP-9655
The XSS prevention methods used was confused if the URL was encoded (hex-encoded). OTP-9655
Diffstat (limited to 'lib/inets/test/httpd_SUITE.erl')
| -rw-r--r-- | lib/inets/test/httpd_SUITE.erl | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl index 7403d4a643..731a50c70b 100644 --- a/lib/inets/test/httpd_SUITE.erl +++ b/lib/inets/test/httpd_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2010. All Rights Reserved. +%% Copyright Ericsson AB 2005-2011. 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 @@ -126,7 +126,7 @@ all(suite) -> http_1_1_ip, http_1_0_ip, http_0_9_ip, - %% ipv6, + ipv6, tickets ]. @@ -520,14 +520,14 @@ http_1_1_ip(doc) -> ["HTTP/1.1"]; http_1_1_ip(suite) -> [ - ip_host, - ip_chunked, - ip_expect, - ip_range, - ip_if_test, - ip_http_trace, - ip_http1_1_head, - ip_mod_cgi_chunked_encoding_test + %% ip_host, + %% ip_chunked, + %% ip_expect, + %% ip_range, + ip_if_test%% , + %% ip_http_trace, + %% ip_http1_1_head, + %% ip_mod_cgi_chunked_encoding_test ]. %%------------------------------------------------------------------------- @@ -1611,24 +1611,24 @@ ticket_5913(doc) -> ["Tests that a header without last-modified is handled"]; ticket_5913(suite) -> []; ticket_5913(Config) -> - ok=httpd_test_lib:verify_request(ip_comm, ?config(host, Config), - ?IP_PORT, ?config(node, Config), + ok = httpd_test_lib:verify_request(ip_comm, ?config(host, Config), + ?IP_PORT, ?config(node, Config), "GET /cgi-bin/erl/httpd_example:get_bin " "HTTP/1.0\r\n\r\n", [{statuscode, 200}, - {version, "HTTP/1.0"}]), + {version, "HTTP/1.0"}]), ok. ticket_6003(doc) -> ["Tests that a URI with a bad hexadecimal code is handled"]; ticket_6003(suite) -> []; ticket_6003(Config) -> - ok=httpd_test_lib:verify_request(ip_comm, ?config(host, Config), - ?IP_PORT, ?config(node, Config), - "GET http://www.erlang.org/%skalle " - "HTTP/1.0\r\n\r\n", - [{statuscode, 400}, - {version, "HTTP/1.0"}]), + ok = httpd_test_lib:verify_request(ip_comm, ?config(host, Config), + ?IP_PORT, ?config(node, Config), + "GET http://www.erlang.org/%skalle " + "HTTP/1.0\r\n\r\n", + [{statuscode, 400}, + {version, "HTTP/1.0"}]), ok. ticket_7304(doc) -> |