aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/dtls_connection.erl
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-03-19 10:36:00 +0100
committerZandra Hird <[email protected]>2015-03-19 10:36:17 +0100
commit2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce (patch)
treec66710aa5e4dc7c7ac86c40cd49b6d3d47046930 /lib/ssl/src/dtls_connection.erl
parent8f7756db0c1eec733e24d9fadef7c855981c6dc1 (diff)
parent7cf85926c11d38ce5ebd181f9f98185f359d64a3 (diff)
downloadotp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.tar.gz
otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.tar.bz2
otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.zip
Merge branch 'essen/ssl-alpn'
* essen/ssl-alpn: ssl: Add TLS-ALPN support OTP-12580
Diffstat (limited to 'lib/ssl/src/dtls_connection.erl')
-rw-r--r--lib/ssl/src/dtls_connection.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl
index f177a8610d..610e2c4e41 100644
--- a/lib/ssl/src/dtls_connection.erl
+++ b/lib/ssl/src/dtls_connection.erl
@@ -228,9 +228,9 @@ hello(Hello,
case dtls_handshake:hello(Hello, SslOptions, ConnectionStates0, Renegotiation) of
#alert{} = Alert ->
handle_own_alert(Alert, ReqVersion, hello, State);
- {Version, NewId, ConnectionStates, NextProtocol} ->
+ {Version, NewId, ConnectionStates, ProtoExt, Protocol} ->
ssl_connection:handle_session(Hello,
- Version, NewId, ConnectionStates, NextProtocol, State)
+ Version, NewId, ConnectionStates, ProtoExt, Protocol, State)
end;
hello(Msg, State) ->