diff options
author | Ingela Anderton Andin <[email protected]> | 2016-05-04 12:00:09 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-05-04 12:00:09 +0200 |
commit | 4c8fdca47c9e727dfcc1ab2049ffea35cef76b39 (patch) | |
tree | bcbd09adea8774f7eac8367887cad259e0cd2c2e /lib/ssl/src/ssl.erl | |
parent | 97a1ae6023d728fa603368254a504bddc4dbe73c (diff) | |
parent | 0f782eb6377ddd1e5673c186b8b1a37edd610e4b (diff) | |
download | otp-4c8fdca47c9e727dfcc1ab2049ffea35cef76b39.tar.gz otp-4c8fdca47c9e727dfcc1ab2049ffea35cef76b39.tar.bz2 otp-4c8fdca47c9e727dfcc1ab2049ffea35cef76b39.zip |
Merge branch 'ingela/ssl-gen-statem/OTP-13464'
* ingela/ssl-gen-statem/OTP-13464:
ssl: Adapt DTLS to gen_statem
ssl: Use gen_statem instead of gen_fsm
Diffstat (limited to 'lib/ssl/src/ssl.erl')
-rw-r--r-- | lib/ssl/src/ssl.erl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 025e8cea61..dbbb25025c 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -696,7 +696,7 @@ handle_options(Opts0, Role) -> default_option_role(server, true, Role), server, Role), renegotiate_at = handle_option(renegotiate_at, Opts, ?DEFAULT_RENEGOTIATE_AT), - hibernate_after = handle_option(hibernate_after, Opts, undefined), + hibernate_after = handle_option(hibernate_after, Opts, infinity), erl_dist = handle_option(erl_dist, Opts, false), alpn_advertised_protocols = handle_option(alpn_advertised_protocols, Opts, undefined), @@ -885,10 +885,13 @@ validate_option(client_renegotiation, Value) when is_boolean(Value) -> validate_option(renegotiate_at, Value) when is_integer(Value) -> erlang:min(Value, ?DEFAULT_RENEGOTIATE_AT); -validate_option(hibernate_after, undefined) -> - undefined; +validate_option(hibernate_after, undefined) -> %% Backwards compatibility + infinity; +validate_option(hibernate_after, infinity) -> + infinity; validate_option(hibernate_after, Value) when is_integer(Value), Value >= 0 -> Value; + validate_option(erl_dist,Value) when is_boolean(Value) -> Value; validate_option(Opt, Value) |