diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:03:44 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:03:44 +0100 |
| commit | ba9f5c79c77806c199d2bd839c0c19e9da3cdeec (patch) | |
| tree | fadc056dcce0587ea9c8fb414a526f0c096bb9e3 /lib/ssl/src/ssl_internal.hrl | |
| parent | 57e0fb97e74c48c502b2eb35990abf4396e04b52 (diff) | |
| parent | b91e7498e625b4e6419238f753c30b509fb958d2 (diff) | |
| download | otp-ba9f5c79c77806c199d2bd839c0c19e9da3cdeec.tar.gz otp-ba9f5c79c77806c199d2bd839c0c19e9da3cdeec.tar.bz2 otp-ba9f5c79c77806c199d2bd839c0c19e9da3cdeec.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 487d1fa096..cbfcaa46a0 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -156,7 +156,8 @@ -record(config, {ssl, %% SSL parameters inet_user, %% User set inet options - emulated, %% Emulated option list or "inherit_tracker" pid + emulated, %% Emulated option list or "inherit_tracker" pid + udp_handler, inet_ssl, %% inet options for internal ssl socket transport_info, %% Callback info connection_cb |