diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-10-17 16:21:15 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-10-17 16:21:15 +0200 |
| commit | 290c920aca365968ebaa10a63e25fd2579bce408 (patch) | |
| tree | 42b697cfa0b502741758865f38eed4ed2941fbb4 /lib/ssl/src/ssl.erl | |
| parent | 82489e794c015742f8879438394fa8a2f4c6fd1b (diff) | |
| parent | 7d05f57c2182626aaaee4a7c164d4bb6a7b9e38c (diff) | |
| download | otp-290c920aca365968ebaa10a63e25fd2579bce408.tar.gz otp-290c920aca365968ebaa10a63e25fd2579bce408.tar.bz2 otp-290c920aca365968ebaa10a63e25fd2579bce408.zip | |
Merge branch 'ingela/ssl/extend-hostname-check/OTP-14632/OTP-14655' into maint
* ingela/ssl/extend-hostname-check/OTP-14632/OTP-14655:
ssl: Fix test cases to work on all test platforms
public_key: Fix dialyzer spec
ssl: Sessions must be registered with SNI if exists
ssl: Extend hostname check to fallback to checking IP-address
public_key, ssl: Handles keys so that APIs are preserved correctly
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 62da498e76..bb493ed14c 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -1003,7 +1003,7 @@ validate_option(server_name_indication = Opt, Value) when is_list(Value) -> validate_option(server_name_indication, undefined = Value) -> Value; validate_option(server_name_indication, disable) -> - undefined; + disable; validate_option(sni_hosts, []) -> []; |