diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-01-15 15:36:53 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-01-15 15:36:53 +0100 |
| commit | a9b0c987fc6fc6ba11a3db523e4b8afb79c1b69f (patch) | |
| tree | 865c153a245a706c2c8a77d64262a4a63fc3f1fa /lib/ssl/src/ssl_internal.hrl | |
| parent | 39b4b728d5950a9c4db5bb2551919af1d8811a21 (diff) | |
| parent | acc4f00fe4b3c66738aaf3f58951dbf0a96b174c (diff) | |
| download | otp-a9b0c987fc6fc6ba11a3db523e4b8afb79c1b69f.tar.gz otp-a9b0c987fc6fc6ba11a3db523e4b8afb79c1b69f.tar.bz2 otp-a9b0c987fc6fc6ba11a3db523e4b8afb79c1b69f.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/ssl.erl
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index a079c6a796..57b72366d3 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -137,10 +137,10 @@ %% Local policy for the server if it want's to reuse the session %% or not. Defaluts to allways returning true. %% fun(SessionId, PeerCert, Compression, CipherSuite) -> boolean() - reuse_session, + reuse_session :: fun() | binary() | undefined, %% Server side is a fun() %% If false sessions will never be reused, if true they %% will be reused if possible. - reuse_sessions :: boolean(), + reuse_sessions :: boolean() | save, %% Only client side can use value save renegotiate_at, secure_renegotiate, client_renegotiation, @@ -176,6 +176,8 @@ max_handshake_size :: integer(), handshake, customize_hostname_check + %% , + %% save_session :: boolean() }). -record(socket_options, |