diff options
author | Fredrik Gustafsson <[email protected]> | 2013-08-23 16:31:47 +0200 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-08-23 16:31:47 +0200 |
commit | cefaaa6eddafbd3fd418eec5551819a82935e3b3 (patch) | |
tree | 36990f0931083fb6703bc97706b47b264bb2f388 /lib/ssl/src/ssl_internal.hrl | |
parent | 7fcb9c4b3df1ec2edfdb187635ea8dcd856dc65d (diff) | |
parent | fa5cc308af8c073832cc7b58dd52fa2f523582cc (diff) | |
download | otp-cefaaa6eddafbd3fd418eec5551819a82935e3b3.tar.gz otp-cefaaa6eddafbd3fd418eec5551819a82935e3b3.tar.bz2 otp-cefaaa6eddafbd3fd418eec5551819a82935e3b3.zip |
Merge branch 'maint'
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 14db4a6067..de8d20d399 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -111,7 +111,8 @@ %% This option should only be set to true by inet_tls_dist erl_dist = false, next_protocols_advertised = undefined, %% [binary()], - next_protocol_selector = undefined %% fun([binary()]) -> binary()) + next_protocol_selector = undefined, %% fun([binary()]) -> binary()) + log_alert }). -record(socket_options, |