diff options
author | Zandra Hird <[email protected]> | 2015-03-19 10:36:00 +0100 |
---|---|---|
committer | Zandra Hird <[email protected]> | 2015-03-19 10:36:17 +0100 |
commit | 2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce (patch) | |
tree | c66710aa5e4dc7c7ac86c40cd49b6d3d47046930 /lib/ssl/src/ssl_internal.hrl | |
parent | 8f7756db0c1eec733e24d9fadef7c855981c6dc1 (diff) | |
parent | 7cf85926c11d38ce5ebd181f9f98185f359d64a3 (diff) | |
download | otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.tar.gz otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.tar.bz2 otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.zip |
Merge branch 'essen/ssl-alpn'
* essen/ssl-alpn:
ssl: Add TLS-ALPN support
OTP-12580
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
-rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 8df79f9e8c..e09a72a3f3 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -116,6 +116,8 @@ hibernate_after :: boolean(), %% This option should only be set to true by inet_tls_dist erl_dist = false :: boolean(), + alpn_advertised_protocols = undefined :: [binary()], + alpn_preferred_protocols = undefined :: [binary()], next_protocols_advertised = undefined, %% [binary()], next_protocol_selector = undefined, %% fun([binary()]) -> binary()) log_alert :: boolean(), |