aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_connection.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-05-09 09:23:23 +0200
committerIngela Anderton Andin <[email protected]>2016-05-09 09:23:23 +0200
commit87d869dd7b8711d4a43aaaf9a876df16f4f4f5b9 (patch)
tree33816ad1ce457aeb6fa18721d6f78fc78c3c38fb /lib/ssl/src/ssl_connection.erl
parentdb39317ea85f7d8646b3da3d96f2f05954e16665 (diff)
parent470976e07820f0c8cd99b3437d1b7fbebd76004c (diff)
downloadotp-87d869dd7b8711d4a43aaaf9a876df16f4f4f5b9.tar.gz
otp-87d869dd7b8711d4a43aaaf9a876df16f4f4f5b9.tar.bz2
otp-87d869dd7b8711d4a43aaaf9a876df16f4f4f5b9.zip
Merge branch 'ingela/ssl/memory-foot-print'
* ingela/ssl/memory-foot-print: ssl: Add reinitialization of handshake data lost in gen_statem refactorization
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
-rw-r--r--lib/ssl/src/ssl_connection.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 57fa1b904e..a7657c829a 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1920,9 +1920,11 @@ prepare_connection(#state{renegotiation = Renegotiate,
start_or_recv_from = RecvFrom} = State0, Connection)
when Renegotiate =/= {false, first},
RecvFrom =/= undefined ->
- {Record, State} = Connection:next_record(State0),
+ State1 = Connection:reinit_handshake_data(State0),
+ {Record, State} = Connection:next_record(State1),
{Record, ack_connection(State)};
-prepare_connection(State, _) ->
+prepare_connection(State0, Connection) ->
+ State = Connection:reinit_handshake_data(State0),
{no_record, ack_connection(State)}.
ack_connection(#state{renegotiation = {true, Initiater}} = State)