diff options
| author | Micael Karlberg <[email protected]> | 2011-09-23 14:10:53 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-23 14:10:53 +0200 |
| commit | 524ad34276ef31fc5c306943539e3fe9bd19ad8c (patch) | |
| tree | b6d497f9461375b02527bc3d1f10c7a58f3e38e0 /lib/ssl/src/ssl_internal.hrl | |
| parent | 3f9de4601b8539eea14de2d1517f54956e05d03a (diff) | |
| parent | 92657321ac647f343c6b88985d66a2d611fd982d (diff) | |
| download | otp-524ad34276ef31fc5c306943539e3fe9bd19ad8c.tar.gz otp-524ad34276ef31fc5c306943539e3fe9bd19ad8c.tar.bz2 otp-524ad34276ef31fc5c306943539e3fe9bd19ad8c.zip | |
Merge branch 'major' of super:otp into bmk/inets/inets58_integration
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 6bf1edc452..483e06067c 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -98,10 +98,12 @@ renegotiate_at, secure_renegotiate, debug, - hibernate_after % undefined if not hibernating, + hibernate_after,% undefined if not hibernating, % or number of ms of inactivity % after which ssl_connection will % go into hibernation + %% This option should only be set to true by inet_tls_dist + erl_dist = false }). -record(socket_options, |