diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-06-19 08:16:41 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-06-19 08:16:41 +0200 |
| commit | b7afb154975f123a785d8223c686e19eb947c3af (patch) | |
| tree | a8ca36f7f22307f734303b6184c1e7444ad91d81 /lib | |
| parent | 1d12eae751c9c14626365d32947a7931ce55dbba (diff) | |
| parent | 1f3dde12d06bb325f51ecba2bbd48b4040474136 (diff) | |
| download | otp-b7afb154975f123a785d8223c686e19eb947c3af.tar.gz otp-b7afb154975f123a785d8223c686e19eb947c3af.tar.bz2 otp-b7afb154975f123a785d8223c686e19eb947c3af.zip | |
Merge branch 'ingela/ssl/TLS-hibernate-bug/OTP-15910' into maint
* ingela/ssl/TLS-hibernate-bug/OTP-15910:
ssl: Fix hibernation bug
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index dabc2f8ec8..323d9e3284 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -259,7 +259,7 @@ next_event(StateName, Record, State) -> next_event(StateName, no_record, State0, Actions) -> case next_record(StateName, State0) of {no_record, State} -> - {next_state, StateName, State, Actions}; + ssl_connection:hibernate_after(StateName, State, Actions); {Record, State} -> next_event(StateName, Record, State, Actions) end; diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index a5aa81a67d..0cdfea0ac2 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -3676,7 +3676,7 @@ hibernate(Config) -> ssl_test_lib:check_result(Server, ok, Client, ok), - timer:sleep(1500), + ct:sleep(1500), {current_function, {erlang, hibernate, 3}} = process_info(Pid, current_function), @@ -3712,6 +3712,8 @@ hibernate_right_away(Config) -> [{port, Port1}, {options, [{hibernate_after, 0}|ClientOpts]}]), ssl_test_lib:check_result(Server1, ok, Client1, ok), + + ct:sleep(1000), %% Schedule out {current_function, {erlang, hibernate, 3}} = process_info(Pid1, current_function), |