diff options
| author | Erlang/OTP <[email protected]> | 2016-04-26 12:01:03 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-04-26 12:01:03 +0200 |
| commit | 7c8866b6b4fabb0ef6e35384c30a60e7c5b73e91 (patch) | |
| tree | 79dc21769a8c4b19c36fd1284ee891ea0482ff56 /lib/inets/test/httpd_SUITE.erl | |
| parent | fbcbe079db40e63c1d9dc264139e3c4cc08c1cdd (diff) | |
| parent | 235c32bcb1f91f803ba3d3c8a01edc1399d7a398 (diff) | |
| download | otp-7c8866b6b4fabb0ef6e35384c30a60e7c5b73e91.tar.gz otp-7c8866b6b4fabb0ef6e35384c30a60e7c5b73e91.tar.bz2 otp-7c8866b6b4fabb0ef6e35384c30a60e7c5b73e91.zip | |
Merge branch 'ingela/inets/http_server-ssl-peer-cert/OTP-13510' into maint-18
* ingela/inets/http_server-ssl-peer-cert/OTP-13510:
inets: Prepare for release
inets: Add peer_cert to ESI environment
Diffstat (limited to 'lib/inets/test/httpd_SUITE.erl')
| -rw-r--r-- | lib/inets/test/httpd_SUITE.erl | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl index 1d8a603981..93520c1cb4 100644 --- a/lib/inets/test/httpd_SUITE.erl +++ b/lib/inets/test/httpd_SUITE.erl @@ -755,7 +755,11 @@ esi(Config) when is_list(Config) -> %% Check "ErlScriptNoCache" directive (default: false) ok = http_status("GET /cgi-bin/erl/httpd_example:get ", Config, [{statuscode, 200}, - {no_header, "cache-control"}]). + {no_header, "cache-control"}]), + ok = http_status("GET /cgi-bin/erl/httpd_example:peer ", + Config, [{statuscode, 200}, + {header, "peer-cert-exist", peer(Config)}]). + %%------------------------------------------------------------------------- mod_esi_chunk_timeout(Config) when is_list(Config) -> ok = httpd_1_1:mod_esi_chunk_timeout(?config(type, Config), @@ -2065,3 +2069,11 @@ response_default_headers() -> {"X-Frame-Options", "SAMEORIGIN"}, %% Override built-in default {"Date", "Override-date"}]. + +peer(Config) -> + case proplists:get_value(type, Config) of + ssl -> + "true"; + _ -> + "false" + end.
\ No newline at end of file |