diff options
| author | Erlang/OTP <[email protected]> | 2019-07-02 13:44:45 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-07-02 13:44:45 +0200 |
| commit | cab74c43de624df3de3810128a1e3240e8e0f2b3 (patch) | |
| tree | 7d7d62ac35913b2a89512d0918fb8149c0153c63 /lib/ssl | |
| parent | 7e5af024d07418ddc9c1e7068bf1aa2d99e1b178 (diff) | |
| parent | 1f3dde12d06bb325f51ecba2bbd48b4040474136 (diff) | |
| download | otp-cab74c43de624df3de3810128a1e3240e8e0f2b3.tar.gz otp-cab74c43de624df3de3810128a1e3240e8e0f2b3.tar.bz2 otp-cab74c43de624df3de3810128a1e3240e8e0f2b3.zip | |
Merge branch 'ingela/ssl/TLS-hibernate-bug/OTP-15910' into maint-21
* ingela/ssl/TLS-hibernate-bug/OTP-15910:
ssl: Fix hibernation bug
# Conflicts:
# lib/ssl/src/tls_connection.erl
Diffstat (limited to 'lib/ssl')
| -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 ae05a1f873..55ab9ff54a 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -232,7 +232,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 4452adaea7..b23ef74c50 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -3769,7 +3769,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), @@ -3805,6 +3805,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), |