diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-05-08 15:36:21 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-06-08 16:52:05 +0200 |
| commit | c7cdcb85f8116dda47c2960df1c8a3f3caf56d64 (patch) | |
| tree | 136ef0c503061fe9c1f3050df71bd98ae06a99a1 /lib/ssl/src/ssl_connection.erl | |
| parent | a0981bf885a99cce1dee1775378d56eb661eec27 (diff) | |
| download | otp-c7cdcb85f8116dda47c2960df1c8a3f3caf56d64.tar.gz otp-c7cdcb85f8116dda47c2960df1c8a3f3caf56d64.tar.bz2 otp-c7cdcb85f8116dda47c2960df1c8a3f3caf56d64.zip | |
ssl: Move and avoid ets:select bottleneck in client
Do not use ssl_manager process for selecting an id. It's unnecessary
to involve the manager process at all on the client side.
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index df0af45a3b..431e6a3eaf 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -348,7 +348,7 @@ hello(start, #state{host = Host, port = Port, role = client, connection_states = ConnectionStates, renegotiation = {Renegotiation, _}} = State0) -> Hello = ssl_handshake:client_hello(Host, Port, ConnectionStates, SslOpts, - Renegotiation, Cert), + Cache, CacheCb, Renegotiation, Cert), Version = Hello#client_hello.client_version, Hashes0 = ssl_handshake:init_hashes(), @@ -393,7 +393,7 @@ hello(#server_hello{cipher_suite = CipherSuite, case ssl_session:is_new(OldId, NewId) of true -> - handle_new_session(NewId, CipherSuite, Compression, State); + handle_new_session(NewId, CipherSuite, Compression, State#state{connection_states = ConnectionStates}); false -> handle_resumed_session(NewId, State#state{connection_states = ConnectionStates}) end; @@ -699,7 +699,7 @@ connection(#hello_request{}, #state{host = Host, port = Port, renegotiation = {Renegotiation, _}, tls_handshake_hashes = Hashes0} = State0) -> Hello = ssl_handshake:client_hello(Host, Port, ConnectionStates0, SslOpts, - Renegotiation, Cert), + Cache, CacheCb, Renegotiation, Cert), {BinMsg, ConnectionStates1, Hashes1} = encode_handshake(Hello, Version, ConnectionStates0, Hashes0), |