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_test_lib.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_test_lib.erl')
| -rw-r--r-- | lib/inets/test/httpd_test_lib.erl | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl index a5b836f651..c58966ce10 100644 --- a/lib/inets/test/httpd_test_lib.erl +++ b/lib/inets/test/httpd_test_lib.erl @@ -235,11 +235,17 @@ validate(RequestStr, #state{status_line = {Version, StatusCode, _}, _ -> ok end, - do_validate(http_response:header_list(Headers), Options, N, P), - check_body(RequestStr, StatusCode, - Headers#http_response_h.'content-type', - list_to_integer(Headers#http_response_h.'content-length'), - Body). + HList = http_response:header_list(Headers), + do_validate(HList, Options, N, P), + case lists:keysearch("warning", 1, HList) of + {value, _} -> + ok; + _ -> + check_body(RequestStr, StatusCode, + Headers#http_response_h.'content-type', + list_to_integer(Headers#http_response_h.'content-length'), + Body) + end. %-------------------------------------------------------------------- %% Internal functions |