diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-01-25 10:36:00 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-01-25 10:36:00 +0100 |
| commit | e1430adbefd18b7e7b6c5e3509caad8d6450b21e (patch) | |
| tree | e7f67a29eaf7a85076ef1ac97ae1277c602e5cd1 /lib/ssl/src/tls_connection.erl | |
| parent | 453934c7f240c1105088a63b8c4bb24e191c8b81 (diff) | |
| parent | 62238bdab1c035388d83bdfb670ee178c6f3f448 (diff) | |
| download | otp-e1430adbefd18b7e7b6c5e3509caad8d6450b21e.tar.gz otp-e1430adbefd18b7e7b6c5e3509caad8d6450b21e.tar.bz2 otp-e1430adbefd18b7e7b6c5e3509caad8d6450b21e.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index b2b85eaf8d..c3f0206d25 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -764,6 +764,8 @@ handle_tls_handshake(Handle, StateName, case Handle(Packet, FsmReturn) of {next_state, NextStateName, State, _Timeout} -> handle_tls_handshake(Handle, NextStateName, State); + {next_state, NextStateName, State} -> + handle_tls_handshake(Handle, NextStateName, State); {stop, _,_} = Stop -> Stop end; |