diff options
author | Fredrik Gustafsson <[email protected]> | 2013-11-11 10:05:12 +0100 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-11-11 10:05:12 +0100 |
commit | a2d97b6405066c702678e891d0d3c7640b81d621 (patch) | |
tree | 5add7650f8d4599ba736ab5955b0abda31dd29cb /lib/ssl/src/ssl_internal.hrl | |
parent | 7724137c2952a343a709fc9e2f1a44eb2e1fb584 (diff) | |
parent | 06d4f009136b853cd8b50a6b5e8ae0ff5bb54041 (diff) | |
download | otp-a2d97b6405066c702678e891d0d3c7640b81d621.tar.gz otp-a2d97b6405066c702678e891d0d3c7640b81d621.tar.bz2 otp-a2d97b6405066c702678e891d0d3c7640b81d621.zip |
Merge branch 'klyr/ssl_sni_client/OTP-11460' into maint
* klyr/ssl_sni_client/OTP-11460:
Update documentation
Add a new server_name_indication option to ssl:connect
Add SSL Server Name Indication (SNI) client support
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
-rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 96e3280fb5..a582b8c290 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -115,7 +115,8 @@ erl_dist = false, next_protocols_advertised = undefined, %% [binary()], next_protocol_selector = undefined, %% fun([binary()]) -> binary()) - log_alert + log_alert, + server_name_indication = undefined }). -record(socket_options, |