aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-11-19 15:45:54 +0100
committerIngela Anderton Andin <[email protected]>2012-11-19 15:45:54 +0100
commit75de9824a7c7ac8eeda37245f6e55198c147332f (patch)
tree951390e0505c8b83e741113f1d445dc5d05c6c27
parenta636566504740916750419d8d94fd0a28ee672e5 (diff)
parent608ae226acd4c6340c66ce6038436f849b735673 (diff)
downloadotp-75de9824a7c7ac8eeda37245f6e55198c147332f.tar.gz
otp-75de9824a7c7ac8eeda37245f6e55198c147332f.tar.bz2
otp-75de9824a7c7ac8eeda37245f6e55198c147332f.zip
Merge remote branch 'upstream/maint'
-rw-r--r--lib/ssl/src/ssl_connection.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 407ec14b0a..87cf49d07d 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -2516,9 +2516,9 @@ handle_unrecv_data(StateName, #state{socket = Socket, transport_cb = Transport}
handle_close_alert(Data, StateName, State)
end.
-handle_close_alert(Data, StateName, State) ->
- case next_tls_record(Data, State) of
- #ssl_tls{type = ?ALERT, fragment = EncAlerts} ->
+handle_close_alert(Data, StateName, State0) ->
+ case next_tls_record(Data, State0) of
+ {#ssl_tls{type = ?ALERT, fragment = EncAlerts}, State} ->
[Alert|_] = decode_alerts(EncAlerts),
handle_normal_shutdown(Alert, StateName, State);
_ ->