diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-05-15 11:47:07 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-05-15 11:47:07 +0200 |
| commit | 8a24056309f17154c807ec1a6f4ba5400d8bbc63 (patch) | |
| tree | f8f14ba0887ee4758357e73d3146e495bfb0f667 | |
| parent | 1c19c9af6531f600bf3368b8c7baed243cecc2a3 (diff) | |
| parent | 319dcabd1104b2a2befc46b9f49446a5f6485008 (diff) | |
| download | otp-8a24056309f17154c807ec1a6f4ba5400d8bbc63.tar.gz otp-8a24056309f17154c807ec1a6f4ba5400d8bbc63.tar.bz2 otp-8a24056309f17154c807ec1a6f4ba5400d8bbc63.zip | |
Merge branch 'ingela/ssl-flow-ctrl/ERL-934/OTP-15825' into maint
* ingela/ssl-flow-ctrl/ERL-934/OTP-15825:
ssl: Refactor of OTP 22 code due to patch 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
Conflicts:
lib/ssl/src/tls_connection.erl
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 9b6a61800f..61281a3fb2 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -171,7 +171,6 @@ next_record(_, #state{protocol_buffers = connection_states = ConnectionStates, ssl_options = #ssl_options{padding_check = Check}} = State) -> next_record(State, CipherTexts, ConnectionStates, Check); - next_record(connection, #state{protocol_buffers = #protocol_buffers{tls_cipher_texts = []}, protocol_specific = #{active_n_toggle := true} } = State) -> |