diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-23 17:07:08 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-23 17:07:08 +0100 |
| commit | 6a51514556328dcc56de8f2b75eae01b18b96637 (patch) | |
| tree | e22dac4c9e289a29646838b1406d144d915ea31a /lib/ssl/src/tls_connection.erl | |
| parent | 754afa1d10e32d2e50d0a8b5ddf316037ba9d6fc (diff) | |
| parent | a453532fe31eecd8c39b5035702ee20b402fd687 (diff) | |
| download | otp-6a51514556328dcc56de8f2b75eae01b18b96637.tar.gz otp-6a51514556328dcc56de8f2b75eae01b18b96637.tar.bz2 otp-6a51514556328dcc56de8f2b75eae01b18b96637.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 43422fab8d..a43e0ac56e 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -476,6 +476,7 @@ hello(internal, #client_hello{client_version = ClientVersion} = Hello, gen_handshake(ssl_connection, hello, internal, {common_client_hello, Type, ServerHelloExt}, State#state{connection_states = ConnectionStates, negotiated_version = Version, + client_hello_version = ClientVersion, hashsign_algorithm = HashSign, session = Session, negotiated_protocol = Protocol}) |