diff options
| author | Erlang/OTP <[email protected]> | 2013-08-21 12:54:38 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-08-21 12:54:38 +0200 |
| commit | b6b47d4c18c88380ea104aab57e13363c7b24a51 (patch) | |
| tree | 7083aba98b243d6a1cd6aa279da737295f4f22bf /lib/ssl/src/ssl_internal.hrl | |
| parent | a21db4078a7b5f23b665dc2d466541b394936cb8 (diff) | |
| parent | 2ab0f356a00f42060d0f4ca9c4225644e2d9052e (diff) | |
| download | otp-b6b47d4c18c88380ea104aab57e13363c7b24a51.tar.gz otp-b6b47d4c18c88380ea104aab57e13363c7b24a51.tar.bz2 otp-b6b47d4c18c88380ea104aab57e13363c7b24a51.zip | |
Merge branch 'fredrik/inets/ssl/fixup_log_alert_option/OTP-11259' into maint-r15
* fredrik/inets/ssl/fixup_log_alert_option/OTP-11259:
[inets, ssl]: make log_alert configurable as option in ssl, SSLLogLevel added as option to inets conf file
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 b8f2ae3b51..d8815369e9 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -106,7 +106,8 @@ % after which ssl_connection will % go into hibernation %% This option should only be set to true by inet_tls_dist - erl_dist = false + erl_dist = false, + log_alert }). -record(socket_options, |