aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-03-04 15:36:52 +0100
committerIngela Anderton Andin <[email protected]>2014-03-04 15:36:52 +0100
commitdb36a1ae51f165f87cd499587af580025701b9cf (patch)
tree88d5f8a8f18c52db45f9c37c82e8f0854df733ba
parent59a2db379671026eaf926219be07b260a81baf72 (diff)
parent14d7935b282fde10679bd7096012be4c7855595c (diff)
downloadotp-db36a1ae51f165f87cd499587af580025701b9cf.tar.gz
otp-db36a1ae51f165f87cd499587af580025701b9cf.tar.bz2
otp-db36a1ae51f165f87cd499587af580025701b9cf.zip
Merge branch 'ia/ssl/option-check'
* ia/ssl/option-check: ssl: Add exception for inet and inet6 to proplist check
-rw-r--r--lib/ssl/src/ssl.erl5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index d46c05c5f3..9e098e12c4 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -1048,5 +1048,10 @@ assert_proplist([]) ->
true;
assert_proplist([{Key,_} | Rest]) when is_atom(Key) ->
assert_proplist(Rest);
+%% Handle exceptions
+assert_proplist([inet | Rest]) ->
+ assert_proplist(Rest);
+assert_proplist([inet6 | Rest]) ->
+ assert_proplist(Rest);
assert_proplist([Value | _]) ->
throw({option_not_a_key_value_tuple, Value}).