diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-23 16:30:50 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-23 16:30:50 +0200 |
| commit | fa5cc308af8c073832cc7b58dd52fa2f523582cc (patch) | |
| tree | bc1b7caf4b56406bdf63ba72faf261c1e51ce6a2 /lib/ssl/src/ssl_internal.hrl | |
| parent | 10530282667123151c1c24842f6e4bfbd3b59a76 (diff) | |
| parent | 614816910235c0941b2f36da520610e777b35fc3 (diff) | |
| download | otp-fa5cc308af8c073832cc7b58dd52fa2f523582cc.tar.gz otp-fa5cc308af8c073832cc7b58dd52fa2f523582cc.tar.bz2 otp-fa5cc308af8c073832cc7b58dd52fa2f523582cc.zip | |
Merge branch 'maint-r16' into 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, |