diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-05-14 14:44:31 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-05-14 14:44:31 +0200 |
| commit | 7611d65a46ce2a811890085f166799701f6bba2b (patch) | |
| tree | dc11c07856133971517ba8d58cbdc38e8581b283 /lib/ssl/src/ssl_connection.erl | |
| parent | 416d7690d325f10c20fd7080ef324e76acae11c1 (diff) | |
| parent | cb6ccd90bb8a23ac5e6afd9df65887d2f1723338 (diff) | |
| download | otp-7611d65a46ce2a811890085f166799701f6bba2b.tar.gz otp-7611d65a46ce2a811890085f166799701f6bba2b.tar.bz2 otp-7611d65a46ce2a811890085f166799701f6bba2b.zip | |
Merge branch 'ingela/ssl/flow-ctrl/ERL-934/ERL-938/OTP-15823' into maint
* ingela/ssl/flow-ctrl/ERL-934/ERL-938/OTP-15823:
ssl: Avoid dialyzer warning
ssl: Add test cases for issue reported in ERL-938
ssl: Internal active n must back off when user does not read data
ssl: Remove legacy calls to next_record
Revert "ssl: Add check when to toggle internal active N"
Conflicts:
lib/ssl/src/dtls_connection.erl
lib/ssl/src/ssl_connection.erl
lib/ssl/src/tls_connection.erl
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index a5f754d2e3..345db7510f 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1194,7 +1194,7 @@ cipher(internal, #next_protocol{selected_protocol = SelectedProtocol}, #state{static_env = #static_env{role = server}, handshake_env = #handshake_env{expecting_finished = true, expecting_next_protocol_negotiation = true} = HsEnv} = State, Connection) -> - Connection:next_event(?FUNCTION_NAME, no_record, + Connection:next_event(?FUNCTION_NAME, no_record, State#state{handshake_env = HsEnv#handshake_env{negotiated_protocol = SelectedProtocol, expecting_next_protocol_negotiation = false}}); cipher(internal, #change_cipher_spec{type = <<1>>}, #state{handshake_env = HsEnv, connection_states = ConnectionStates0} = |