aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2018-08-24 10:08:27 +0200
committerLars Thorsen <[email protected]>2018-08-24 10:08:27 +0200
commit35979da59dd3c88601ed73a5eeb9054bbd28b5a1 (patch)
treece609632d3e5cae8714f47a7cb2d30aa705aeee1 /lib/inets/test
parent2ce155ca0de6890cd5750d97a6593d67d4d940f7 (diff)
parentd35d59cea514582817f1fc450885d6a060e542c0 (diff)
downloadotp-35979da59dd3c88601ed73a5eeb9054bbd28b5a1.tar.gz
otp-35979da59dd3c88601ed73a5eeb9054bbd28b5a1.tar.bz2
otp-35979da59dd3c88601ed73a5eeb9054bbd28b5a1.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release Updated the engine load functionality inets: Prepare for release inets: Use status code 501 when no mod_* handles the request ssl: Prepare for release ssl: Make sure that a correct cipher suite is selected ssl: Make sure that a correct cipher suite is selected
Diffstat (limited to 'lib/inets/test')
-rw-r--r--lib/inets/test/httpd_SUITE.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index c5751e79a6..9777c9b68e 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -2047,6 +2047,7 @@ head_status(_) ->
basic_conf() ->
[{modules, [mod_alias, mod_range, mod_responsecontrol,
mod_trace, mod_esi, mod_cgi, mod_get, mod_head]}].
+
not_sup_conf() ->
[{modules, [mod_get]}].