aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2018-08-24 10:04:58 +0200
committerLars Thorsen <[email protected]>2018-08-24 10:04:58 +0200
commitd35d59cea514582817f1fc450885d6a060e542c0 (patch)
tree86e440439b5dcb2bd8b7a6fb16fde2fc9471ea72 /lib/inets/test
parent487f0c12e8700d31161a3bbb9c36e360aff484ac (diff)
parent53b1e77ea7be8d90d652521a2326046b5d95c3e2 (diff)
downloadotp-d35d59cea514582817f1fc450885d6a060e542c0.tar.gz
otp-d35d59cea514582817f1fc450885d6a060e542c0.tar.bz2
otp-d35d59cea514582817f1fc450885d6a060e542c0.zip
Merge branch 'maint-21' into maint
* maint-21: 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]}].