diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-05-28 09:20:41 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-05-28 09:20:41 +0200 |
| commit | 54ba6869f4807a5b70868eb0204900d9de0d9f43 (patch) | |
| tree | edfa73db766097db5effb014fb2a060b94adec51 /lib/ssl/src/ssl_connection.hrl | |
| parent | fbf868910593b74776eba6a0c970b123502a759e (diff) | |
| parent | a2eb7ee1cd9cc19f1c4c14ad7ff4e70de05bfe96 (diff) | |
| download | otp-54ba6869f4807a5b70868eb0204900d9de0d9f43.tar.gz otp-54ba6869f4807a5b70868eb0204900d9de0d9f43.tar.bz2 otp-54ba6869f4807a5b70868eb0204900d9de0d9f43.zip | |
Merge branch 'ia/ssl/improved-options-handling/OTP-11950' into maint
* ia/ssl/improved-options-handling/OTP-11950:
ssl: Correct test SUITE
ssl: Add format_status function to ssl connection process
inets: Correct httpc_SUITE
ssl: Add ssl options to listen options tracker
ssl: Move init
Diffstat (limited to 'lib/ssl/src/ssl_connection.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.hrl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl index b01c6cb1b3..592889b177 100644 --- a/lib/ssl/src/ssl_connection.hrl +++ b/lib/ssl/src/ssl_connection.hrl @@ -78,7 +78,8 @@ allow_renegotiate = true ::boolean(), expecting_next_protocol_negotiation = false ::boolean(), next_protocol = undefined :: undefined | binary(), - client_ecc % {Curves, PointFmt} + client_ecc, % {Curves, PointFmt} + tracker :: pid() %% Tracker process for listen socket }). -define(DEFAULT_DIFFIE_HELLMAN_PARAMS, |