diff options
| author | Raimo Niskanen <[email protected]> | 2019-02-21 14:42:07 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-02-21 14:42:07 +0100 |
| commit | 9e9884640b7d0ee69cd39909842ec5fc8826859f (patch) | |
| tree | 08afd3c1a804077457d164b63d1c70b56a139518 /lib/ssl/src/ssl.erl | |
| parent | f06f5bf23a3cd1f040c8ab6f059097d22161abc7 (diff) | |
| parent | c4fb3492f48d00214d509de5ec9336e4adf51c58 (diff) | |
| download | otp-9e9884640b7d0ee69cd39909842ec5fc8826859f.tar.gz otp-9e9884640b7d0ee69cd39909842ec5fc8826859f.tar.bz2 otp-9e9884640b7d0ee69cd39909842ec5fc8826859f.zip | |
Merge branch 'raimo/ssl/tls-optimization/OTP-15529' into maint
* raimo/ssl/tls-optimization/OTP-15529:
Inline local function
Optimize binary matching
Clean up module boundaries
Remove redundant return of CipherState
Use iovec() internally in send path
Small binary handling optimizations
Optimize read_application_data with Okasaki queue
Try to optimize decode_cipher_text/3
Optimize application data aggregation
Optimize TLS record parsing with Okasaki queue
Cache strong_random_bytes for IV
Optimize padding
Produce less garbage in encrypt loop
Reorganize #data{}
Tidy up state machine
Add server GC info to bench results
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index c39a6f1603..bdb2283ad6 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2018. All Rights Reserved. +%% Copyright Ericsson AB 1999-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -626,7 +626,7 @@ close(#sslsocket{pid = {ListenSocket, #config{transport_info={Transport,_, _, _} send(#sslsocket{pid = [Pid]}, Data) when is_pid(Pid) -> ssl_connection:send(Pid, Data); send(#sslsocket{pid = [_, Pid]}, Data) when is_pid(Pid) -> - tls_sender:send_data(Pid, erlang:iolist_to_binary(Data)); + tls_sender:send_data(Pid, erlang:iolist_to_iovec(Data)); send(#sslsocket{pid = {_, #config{transport_info={_, udp, _, _}}}}, _) -> {error,enotconn}; %% Emulate connection behaviour send(#sslsocket{pid = {dtls,_}}, _) -> |