aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-12-07 16:04:44 +0100
committerHenrik Nord <[email protected]>2015-12-07 16:04:44 +0100
commit9be3ffd7bbb7fbf386fe7857b3ff9c9803e91cc7 (patch)
tree85218a522fb7eb4dc6cdbcf32d3f5aeab3ebdcbd /lib/ssl/src
parent4e7d93de5f0aa04e6a9c67ee9a16e0f34987c846 (diff)
parent3dd86e73c17631a1e8c12ae4bed8bd320ae66082 (diff)
downloadotp-9be3ffd7bbb7fbf386fe7857b3ff9c9803e91cc7.tar.gz
otp-9be3ffd7bbb7fbf386fe7857b3ff9c9803e91cc7.tar.bz2
otp-9be3ffd7bbb7fbf386fe7857b3ff9c9803e91cc7.zip
Merge branch 'rlipscombe/rl-ssl-options' into maint
* rlipscombe/rl-ssl-options: Ensure single 'raw' option is handled correctly Pass 'raw' options through OTP-13166
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/ssl.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 03495cfd90..6551308935 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -1190,6 +1190,8 @@ assert_proplist([]) ->
assert_proplist([{Key,_} | Rest]) when is_atom(Key) ->
assert_proplist(Rest);
%% Handle exceptions
+assert_proplist([{raw,_,_,_} | Rest]) ->
+ assert_proplist(Rest);
assert_proplist([inet | Rest]) ->
assert_proplist(Rest);
assert_proplist([inet6 | Rest]) ->