diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-09-13 09:43:43 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-09-13 09:43:43 +0200 |
| commit | 51e05033c1c563966f22a7200574554e62257f5d (patch) | |
| tree | 06275d1bf434f528abf33c76397e0300ffaf82bb /lib/ssl/src/ssl_internal.hrl | |
| parent | e80beef326bb9eb2437de31c70656fef4a034746 (diff) | |
| parent | 5b0a4180582921fe3b61b430f0c87d9a68ba6da8 (diff) | |
| download | otp-51e05033c1c563966f22a7200574554e62257f5d.tar.gz otp-51e05033c1c563966f22a7200574554e62257f5d.tar.bz2 otp-51e05033c1c563966f22a7200574554e62257f5d.zip | |
Merge branch 'ia/ssl/dist/OTP-7053' into major
* ia/ssl/dist/OTP-7053:
First fully working version
Use ssl instead of being a proxy command
Connect from both sides works now
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, |