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/tls_connection_sup.erl | |
| 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/tls_connection_sup.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection_sup.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_connection_sup.erl b/lib/ssl/src/tls_connection_sup.erl index 6f0d8a7262..7a637c212a 100644 --- a/lib/ssl/src/tls_connection_sup.erl +++ b/lib/ssl/src/tls_connection_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2013. All Rights Reserved. +%% Copyright Ericsson AB 2007-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -59,7 +59,7 @@ init(_O) -> StartFunc = {tls_connection, start_link, []}, Restart = temporary, % E.g. should not be restarted Shutdown = 4000, - Modules = [tls_connection], + Modules = [tls_connection, ssl_connection], Type = worker, ChildSpec = {Name, StartFunc, Restart, Shutdown, Type, Modules}, |