diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-05-12 10:02:57 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-05-12 10:02:57 +0200 |
| commit | 441c5a4dbc01e33db11b9497c14927da1af896f6 (patch) | |
| tree | 6cb5ca8a67bac193f266e839681ab31f607d3c78 /lib/ssl/src/ssl.app.src | |
| parent | 3b85eee9540b49936d203978369c2a5d7bdd24c4 (diff) | |
| parent | c80735b0c82ec0bbaa2e2bda4f1598210b193556 (diff) | |
| download | otp-441c5a4dbc01e33db11b9497c14927da1af896f6.tar.gz otp-441c5a4dbc01e33db11b9497c14927da1af896f6.tar.bz2 otp-441c5a4dbc01e33db11b9497c14927da1af896f6.zip | |
Merge branch 'ia/ssl/inherit/OTP-11897' into maint
* ia/ssl/inherit/OTP-11897:
ssl: Handle socket option inheritance when pooling of accept sockets is used
Diffstat (limited to 'lib/ssl/src/ssl.app.src')
| -rw-r--r-- | lib/ssl/src/ssl.app.src | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src index 99839f6149..36681e2897 100644 --- a/lib/ssl/src/ssl.app.src +++ b/lib/ssl/src/ssl.app.src @@ -28,6 +28,7 @@ ssl_srp_primes, ssl_alert, ssl_socket, + ssl_listen_tracker_sup, %% Erlang Distribution over SSL/TLS inet_tls_dist, ssl_tls_dist_proxy, |