aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-11-02 12:34:17 +0100
committerIngela Anderton Andin <[email protected]>2018-11-02 12:34:17 +0100
commit0fe9270863dacb3158a5a9b10336101b81e07604 (patch)
tree790cb0a5999be1567e9fde6d6c13de262287c638
parente89cc379a3896efe946879b04fbc4a81971be39b (diff)
parent1fe2896eb4671563452c46789984559a0bb01384 (diff)
downloadotp-0fe9270863dacb3158a5a9b10336101b81e07604.tar.gz
otp-0fe9270863dacb3158a5a9b10336101b81e07604.tar.bz2
otp-0fe9270863dacb3158a5a9b10336101b81e07604.zip
Merge branch 'maint'
-rw-r--r--lib/ssl/src/tls_connection.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index 298758ea38..f6aa3df28f 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -965,6 +965,7 @@ handle_info({CloseTag, Socket}, StateName,
#state{socket = Socket, close_tag = CloseTag,
socket_options = #socket_options{active = Active},
protocol_buffers = #protocol_buffers{tls_cipher_texts = CTs},
+ user_data_buffer = Buffer,
negotiated_version = Version} = State) ->
%% Note that as of TLS 1.1,
@@ -972,7 +973,7 @@ handle_info({CloseTag, Socket}, StateName,
%% session not be resumed. This is a change from TLS 1.0 to conform
%% with widespread implementation practice.
- case (Active == false) andalso (CTs =/= []) of
+ case (Active == false) andalso ((CTs =/= []) or (Buffer =/= <<>>)) of
false ->
case Version of
{1, N} when N >= 1 ->