diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-11-18 10:58:22 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-11-27 16:21:32 +0100 |
| commit | ebbbd714ad2398858b09065bce82830d8affe2a4 (patch) | |
| tree | 8a8851d7053492d8a045e07b5dce2c26a9476f76 /lib/inets/test/httpd_1_1.erl | |
| parent | 7096f9228af1cdf98843660560a0d84b48cf766b (diff) | |
| download | otp-ebbbd714ad2398858b09065bce82830d8affe2a4.tar.gz otp-ebbbd714ad2398858b09065bce82830d8affe2a4.tar.bz2 otp-ebbbd714ad2398858b09065bce82830d8affe2a4.zip | |
inets: Add warning header in "chunk trailer" when mod_esi callback times out or fails
Also remove legacy debug macros and add help function httpd_util:error_log/2
to avoid code duplication.
Diffstat (limited to 'lib/inets/test/httpd_1_1.erl')
| -rw-r--r-- | lib/inets/test/httpd_1_1.erl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/inets/test/httpd_1_1.erl b/lib/inets/test/httpd_1_1.erl index dd9d21bbfc..db6def9d17 100644 --- a/lib/inets/test/httpd_1_1.erl +++ b/lib/inets/test/httpd_1_1.erl @@ -24,7 +24,7 @@ -include_lib("kernel/include/file.hrl"). -export([host/4, chunked/4, expect/4, range/4, if_test/5, trace/4, - head/4, mod_cgi_chunked_encoding_test/5]). + head/4, mod_cgi_chunked_encoding_test/5, mod_esi_chunk_timeout/4]). %% -define(all_keys_lower_case,true). -ifndef(all_keys_lower_case). @@ -274,6 +274,15 @@ mod_cgi_chunked_encoding_test(Type, Port, Host, Node, [Request| Rest])-> [{statuscode, 200}]), mod_cgi_chunked_encoding_test(Type, Port, Host, Node, Rest). + +mod_esi_chunk_timeout(Type, Port, Host, Node) -> + ok = httpd_test_lib:verify_request(Type, Host, Port, Node, + "GET /cgi-bin/erl/httpd_example/chunk_timeout?input=20000 HTTP/1.1\r\n" + "Host:"++ Host ++"\r\n" + "\r\n", + [{statuscode, 200}, + {header, "warning"}]). + %%-------------------------------------------------------------------- %% Internal functions %%-------------------------------------------------------------------- |