diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-03-24 17:08:44 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-05-03 13:46:50 +0200 |
| commit | 67de1ba82d1af910dc6ab6d41a1f22dbfb39f658 (patch) | |
| tree | d5e60bb5228d1784b22a33b4980959cba0281368 /lib/ssl/src/ssl.erl | |
| parent | 94e70f82df417d9e673a13d101007d7ae8932df7 (diff) | |
| download | otp-67de1ba82d1af910dc6ab6d41a1f22dbfb39f658.tar.gz otp-67de1ba82d1af910dc6ab6d41a1f22dbfb39f658.tar.bz2 otp-67de1ba82d1af910dc6ab6d41a1f22dbfb39f658.zip | |
ssl: Use gen_statem instead of gen_fsm
Also reduce timing issues in tests
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) |