diff options
| author | Henrik Nord <[email protected]> | 2015-12-07 16:07:18 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-12-07 16:07:18 +0100 |
| commit | 494afc417880374d11971b73e8aab3d2321eee2d (patch) | |
| tree | a3f053d32c145e22d6a7d6d295fe1f983f29eebe /lib/ssl/src | |
| parent | 8081c6d2ac8f69bfa3ef718dfb8f9a1abe6ea908 (diff) | |
| parent | 9be3ffd7bbb7fbf386fe7857b3ff9c9803e91cc7 (diff) | |
| download | otp-494afc417880374d11971b73e8aab3d2321eee2d.tar.gz otp-494afc417880374d11971b73e8aab3d2321eee2d.tar.bz2 otp-494afc417880374d11971b73e8aab3d2321eee2d.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 2 |
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]) -> |